Skip to content

Commit eb05773

Browse files
normjnormj
authored
Set assembly version for all targets to fixed 4.0 version number (#3781)
* Set assembly version for all targets to fixed 4.0 version number to avoid binding issues. The assembly file version should be used to understand the version of the assembly. * Set extensions AssemblyInfo.cs AssemblyVersion to all use 4.0
1 parent c9583de commit eb05773

File tree

10 files changed

+25
-54
lines changed

10 files changed

+25
-54
lines changed

‎extensions/src/AWSSDK.Extensions.Bedrock.MEAI/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
1717

18-
#if NETFRAMEWORK
1918
[assembly: AssemblyVersion("4.0")]
20-
#else
21-
[assembly: AssemblyVersion("4.0.0.0")]
22-
#endif
2319
[assembly: AssemblyFileVersion("4.0.0.0")]

‎extensions/src/AWSSDK.Extensions.CloudFront.Signers/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
1717

18-
#if NETFRAMEWORK
1918
[assembly: AssemblyVersion("4.0")]
20-
#else
21-
[assembly: AssemblyVersion("4.0.0.0")]
22-
#endif
2319
[assembly: AssemblyFileVersion("4.0.0.0")]

‎extensions/src/AWSSDK.Extensions.CrtIntegration/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
1717

18-
#if NETFRAMEWORK
1918
[assembly: AssemblyVersion("4.0")]
20-
#else
21-
[assembly: AssemblyVersion("4.0.0.0")]
22-
#endif
2319
[assembly: AssemblyFileVersion("4.0.0.0")]

‎extensions/src/AWSSDK.Extensions.EC2.DecryptPassword/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
1717

18-
#if NETFRAMEWORK
1918
[assembly: AssemblyVersion("4.0")]
20-
#else
21-
[assembly: AssemblyVersion("4.0.0.0")]
22-
#endif
2319
[assembly: AssemblyFileVersion("4.0.0.0")]

‎extensions/src/AWSSDK.Extensions.NETCore.Setup/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
// COM, set the ComVisible attribute to true on that type.
1616
[assembly: ComVisible(false)]
1717

18-
[assembly: AssemblyVersion("4.0.0.0")]
18+
[assembly: AssemblyVersion("4.0")]
1919
[assembly: AssemblyFileVersion("4.0.0.0")]

‎generator/.DevConfigs/FFEEA749-5916-4B6D-A546-48A887CED3EB.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"core": {
3+
"changeLogMessages": [
4+
"Set assembly version for all targets to fixed 4.0 version number to avoid binding issues. The assembly file version should be used to understand the version of the assembly."
5+
],
6+
"type": "Patch",
7+
"updateMinimum": true
8+
}
9+
}

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
1515
/// Class to produce the template output
1616
/// </summary>
1717

18-
#line 1 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
18+
#line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
1919
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
2020
public partial class AssemblyInfo : BaseGenerator
2121
{
@@ -36,35 +36,35 @@ public override string TransformText()
3636
// associated with an assembly.
3737
[assembly: AssemblyTitle(""");
3838

39-
#line 12 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
39+
#line 12 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
4040
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyTitle));
4141

4242
#line default
4343
#line hidden
4444
this.Write("\")]\r\n#if BCL\r\n[assembly: AssemblyDescription(\"");
4545

46-
#line 14 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
46+
#line 14 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
4747
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: "4.7.2")));
4848

4949
#line default
5050
#line hidden
5151
this.Write("\")]\r\n#elif NETSTANDARD20\r\n[assembly: AssemblyDescription(\"");
5252

53-
#line 16 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
53+
#line 16 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
5454
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: "NetStandard 2.0")));
5555

5656
#line default
5757
#line hidden
5858
this.Write("\")]\r\n#elif NETCOREAPP3_1\r\n[assembly: AssemblyDescription(\"");
5959

60-
#line 18 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
60+
#line 18 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
6161
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: ".NET Core 3.1")));
6262

6363
#line default
6464
#line hidden
6565
this.Write("\")]\r\n#elif NET8_0\r\n[assembly: AssemblyDescription(\"");
6666

67-
#line 20 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
67+
#line 20 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
6868
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: ".NET 8.0")));
6969

7070
#line default
@@ -96,24 +96,16 @@ public override string TransformText()
9696
// You can specify all the values or you can default the Build and Revision Numbers
9797
// by using the '*' as shown below:
9898
// [assembly: AssemblyVersion(""1.0.*"")]
99-
#if BCL
10099
[assembly: AssemblyVersion(""");
101100

102-
#line 48 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
101+
#line 47 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
103102
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceVersion));
104103

105104
#line default
106105
#line hidden
107-
this.Write("\")]\r\n#else\r\n[assembly: AssemblyVersion(\"");
106+
this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
108107

109-
#line 50 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
110-
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
111-
112-
#line default
113-
#line hidden
114-
this.Write("\")]\r\n#endif\r\n[assembly: AssemblyFileVersion(\"");
115-
116-
#line 52 "C:\Projects\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
108+
#line 48 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
117109
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
118110

119111
#line default

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,5 @@ using System.Runtime.CompilerServices;
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646
// [assembly: AssemblyVersion("1.0.*")]
47-
#if BCL
4847
[assembly: AssemblyVersion("<#=this.Config.ServiceVersion #>")]
49-
#else
50-
[assembly: AssemblyVersion("<#=this.Config.ServiceFileVersion #>")]
51-
#endif
5248
[assembly: AssemblyFileVersion("<#=this.Config.ServiceFileVersion #>")]

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.cs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
1515
/// Class to produce the template output
1616
/// </summary>
1717

18-
#line 1 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
18+
#line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
1919
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
2020
public partial class CoreAssemblyInfo : BaseGenerator
2121
{
@@ -83,23 +83,16 @@ public override string TransformText()
8383
"lowing four values:\r\n//\r\n// Major Version\r\n// Minor Version \r\n// " +
8484
"Build Number\r\n// Revision\r\n//\r\n// You can specify all the values or you can" +
8585
" default the Build and Revision Numbers \r\n// by using the \'*\' as shown below:\r\n/" +
86-
"/ [assembly: AssemblyVersion(\"1.0.*\")]\r\n#if BCL\r\n[assembly: AssemblyVersion(\"");
86+
"/ [assembly: AssemblyVersion(\"1.0.*\")]\r\n\r\n[assembly: AssemblyVersion(\"");
8787

88-
#line 56 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
88+
#line 56 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
8989
this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["Version"]));
9090

9191
#line default
9292
#line hidden
93-
this.Write("\")]\r\n#else\r\n[assembly: AssemblyVersion(\"");
93+
this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
9494

95-
#line 58 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
96-
this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["FileVersion"]));
97-
98-
#line default
99-
#line hidden
100-
this.Write("\")]\r\n#endif\r\n[assembly: AssemblyFileVersion(\"");
101-
102-
#line 60 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
95+
#line 57 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt"
10396
this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["FileVersion"]));
10497

10598
#line default

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.tt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,8 @@ using System.Runtime.CompilerServices;
5252
// You can specify all the values or you can default the Build and Revision Numbers
5353
// by using the '*' as shown below:
5454
// [assembly: AssemblyVersion("1.0.*")]
55-
#if BCL
55+
5656
[assembly: AssemblyVersion("<#=this.Session["Version"]#>")]
57-
#else
58-
[assembly: AssemblyVersion("<#=this.Session["FileVersion"] #>")]
59-
#endif
6057
[assembly: AssemblyFileVersion("<#=this.Session["FileVersion"] #>")]
6158

6259
#if BCL

0 commit comments

Comments
 (0)