diff --git a/buildtools/build.proj b/buildtools/build.proj index 22fde2cd4c7c..bf909c79ab0c 100644 --- a/buildtools/build.proj +++ b/buildtools/build.proj @@ -513,7 +513,7 @@ - net462 + net472 AWSSDK.Extensions.CrtIntegration AWSSDK.Extensions.CrtIntegration false diff --git a/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec b/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec index ed3622badcc4..29b4596cca4c 100644 --- a/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec +++ b/extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec @@ -12,13 +12,13 @@ AWS Amazon aws-sdk-v4 images\AWSLogo.png - - + + - + @@ -28,8 +28,8 @@ - - + + diff --git a/generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.cs b/generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.cs index 124d894788eb..122e3f37118c 100644 --- a/generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.cs +++ b/generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.cs @@ -15,7 +15,7 @@ namespace ServiceClientGenerator.Generators.NuGet /// Class to produce the template output /// - #line 1 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" + #line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class CoreNuspec : CoreNuspecBase { @@ -28,13 +28,13 @@ public virtual string TransformText() this.Write("\r\n\r\n \r\n \r\n AWSS" + "DK.Core\r\n AWSSDK - Core Runtime\r\n "); - #line 9 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" + #line 9 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["FileVersion"])); #line default #line hidden - #line 9 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" + #line 9 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\CoreNuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["NuGetPreviewFlag"])); #line default @@ -44,7 +44,7 @@ public virtual string TransformText() "/language>\r\n Apache-2.0\r\n https://github.com/aws/aws-sdk-net/\r\n AWS Amazon cloud aw" + "s-sdk-v4\r\n images\\AWSLogo.png\r\n \r\n " + - "\r\n \r\n \r\n \r\n " + " \r\n \r\n \r\n \r\n \t\t\r\n \r\n \r\n \r\n" + " \r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n \r\n AWS Amazon cloud aws-sdk-v4 images\AWSLogo.png - + @@ -36,9 +36,9 @@ - - - + + + diff --git a/generator/ServiceClientGeneratorLib/Generators/NuGet/Nuspec.cs b/generator/ServiceClientGeneratorLib/Generators/NuGet/Nuspec.cs index b56d1b96ccb5..1ff5267919a6 100644 --- a/generator/ServiceClientGeneratorLib/Generators/NuGet/Nuspec.cs +++ b/generator/ServiceClientGeneratorLib/Generators/NuGet/Nuspec.cs @@ -19,7 +19,7 @@ namespace ServiceClientGenerator.Generators.NuGet /// Class to produce the template output /// - #line 1 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class Nuspec : NuspecBase { @@ -31,34 +31,34 @@ public virtual string TransformText() { this.Write("\r\n \r\n \r\n "); - #line 10 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 10 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["AssemblyName"])); #line default #line hidden this.Write("\r\n "); - #line 11 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 11 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["NuGetTitle"])); #line default #line hidden this.Write("\r\n "); - #line 12 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 12 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["AssemblyVersion"])); #line default #line hidden - #line 12 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 12 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["NuGetPreviewFlag"])); #line default #line hidden this.Write(" \r\n Amazon Web Services\r\n "); - #line 14 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 14 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["AssemblyDescription"])); #line default @@ -67,21 +67,21 @@ public virtual string TransformText() "ache-2.0\r\n https://github.com/aws/aws-sdk-net/\r\n AWS Amazon cloud "); - #line 18 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 18 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["BaseName"])); #line default #line hidden this.Write(" aws-sdk-v4"); - #line 18 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 18 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["ExtraTags"])); #line default #line hidden this.Write("\r\n images\\AWSLogo.png\r\n"); - #line 20 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 20 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" if (bool.Parse(this.Session["requireLicenseAcceptance"].ToString())) { @@ -90,14 +90,14 @@ public virtual string TransformText() #line hidden this.Write(" "); - #line 23 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 23 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["requireLicenseAcceptance"])); #line default #line hidden this.Write("\r\n"); - #line 24 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 24 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" } @@ -106,7 +106,7 @@ public virtual string TransformText() #line hidden this.Write(" \r\n"); - #line 28 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 28 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" if(this.Session.ContainsKey("NugetDependencies")) { @@ -121,14 +121,14 @@ public virtual string TransformText() #line hidden this.Write("\t\t\t\r\n \r\n"); - #line 55 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 55 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" } } @@ -203,7 +203,7 @@ public virtual string TransformText() #line hidden this.Write(" \r\n"); - #line 60 "C:\Dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" + #line 60 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" foreach(var awsDependencyKVP in ((IDictionary)this.Session["AWSDependencies"])) { @@ -213,21 +213,21 @@ public virtual string TransformText() #line hidden this.Write("