Skip to content

Change V4 .NET Framework target from 4.6.2 to 4.7.2 #3346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
normj merged 4 commits into from
Jun 19, 2024
Merged

Change V4 .NET Framework target from 4.6.2 to 4.7.2 #3346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a215a9
Update project files to .NET Framework 4.7.2
normj Jun 18, 2024
453b01a
Generated file changes
normj Jun 18, 2024
226b6b7
Second pass of manual changes
normj Jun 18, 2024
20a449f
Update nuspec for AWSSDK.Extensions.CrtIntegration
normj Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion buildtools/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@
<Message Text="Copying License.txt and Notice.txt to the assembly zips" />
<Copy
SourceFiles="../Notice.txt;../License.txt"
DestinationFiles="../Deployment/assemblies/net462/Notice.txt;../Deployment/assemblies/net462/License.txt"
DestinationFiles="../Deployment/assemblies/net472/Notice.txt;../Deployment/assemblies/net472/License.txt"
/>
<!-- netstandard2.0 needs modified Notice with additional 3rd party dependencies -->
<Copy
Expand Down
2 changes: 1 addition & 1 deletion ...src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AssemblyName>AWSSDK.Extensions.CrtIntegration</AssemblyName>
<PackageId>AWSSDK.Extensions.CrtIntegration</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
10 changes: 5 additions & 5 deletions extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<tags>AWS Amazon aws-sdk-v4</tags>
<icon>images\AWSLogo.png</icon>
<dependencies>
<group targetFramework="net462">
<dependency id="AWSSDK.Core" version="3.7.300" />
<group targetFramework="net472">
<dependency id="AWSSDK.Core" version="4.0.0.0-preview" />
<dependency id="AWSCRT-AUTH" version="0.4.4" />
<dependency id="AWSCRT-CHECKSUMS" version="0.4.4" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="AWSSDK.Core" version="3.7.300" />
<dependency id="AWSSDK.Core" version="4.0.0-preview" />
<dependency id="AWSCRT-AUTH" version="0.4.4" />
<dependency id="AWSCRT-CHECKSUMS" version="0.4.4" />
</group>
Expand All @@ -28,8 +28,8 @@
<files>
<file src="..\..\..\sdk\nuget-content\AWSLogo.png" target="images\" />

<file src=".\bin\Release\net462\AWSSDK.Extensions.CrtIntegration.dll" target="lib\net462" />
<file src=".\bin\Release\net462\AWSSDK.Extensions.CrtIntegration.pdb" target="lib\net462" />
<file src=".\bin\Release\net472\AWSSDK.Extensions.CrtIntegration.dll" target="lib\net472" />
<file src=".\bin\Release\net472\AWSSDK.Extensions.CrtIntegration.pdb" target="lib\net472" />

<file src=".\bin\Release\netstandard2.0\AWSSDK.Extensions.CrtIntegration.dll" target="lib\netstandard2.0"/>
<file src=".\bin\Release\netstandard2.0\AWSSDK.Extensions.CrtIntegration.pdb" target="lib\netstandard2.0"/>
Expand Down
14 changes: 7 additions & 7 deletions generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace ServiceClientGenerator.Generators.NuGet
/// Class to produce the template output
/// </summary>

#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
{
Expand All @@ -28,13 +28,13 @@ public virtual string TransformText()
this.Write("\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<package> \r\n <metadata> \r\n <id>AWSS" +
"DK.Core</id>\r\n <title>AWSSDK - Core Runtime</title>\r\n <version>");

#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
Expand All @@ -44,7 +44,7 @@ public virtual string TransformText()
"/language>\r\n <license type=\"expression\">Apache-2.0</license>\r\n <projectUrl" +
">https://github.com/aws/aws-sdk-net/</projectUrl>\r\n <tags>AWS Amazon cloud aw" +
"s-sdk-v4</tags>\r\n <icon>images\\AWSLogo.png</icon>\r\n <dependencies>\r\n " +
"<group targetFramework=\"net462\">\r\n <dependency id=\"System.Buffers\" versio" +
"<group targetFramework=\"net472\">\r\n <dependency id=\"System.Buffers\" versio" +
"n=\"4.5.1\" />\r\n <dependency id=\"System.Memory\" version=\"4.5.5\" />\r\n " +
" <dependency id=\"System.Text.Json\" version=\"8.0.3\" />\r\n </group>\r\n <gr" +
"oup targetFramework=\"netstandard2.0\">\r\n <dependency id=\"Microsoft.Bcl.Asy" +
Expand All @@ -55,9 +55,9 @@ public virtual string TransformText()
"rk=\"net8.0\">\r\n </group>\t\t\r\n </dependencies>\r\n </metadata> \r\n <files>\r\n" +
" <file src=\"..\\..\\nuget-content\\AWSLogo.png\" target=\"images\\\" />\r\n <file s" +
"rc=\"..\\..\\nuget-content\\account-management.ps1\" target=\"tools\" />\r\n\r\n <file s" +
"rc=\".\\bin\\Release\\net462\\AWSSDK.Core.dll\" target=\"lib\\net462\" />\r\n <file src=" +
"\".\\bin\\Release\\net462\\AWSSDK.Core.xml\" target=\"lib\\net462\" />\r\n <file src=\".\\" +
"bin\\Release\\net462\\AWSSDK.Core.pdb\" target=\"lib\\net462\" />\r\n\r\n <file src=\".\\b" +
"rc=\".\\bin\\Release\\net472\\AWSSDK.Core.dll\" target=\"lib\\net472\" />\r\n <file src=" +
"\".\\bin\\Release\\net472\\AWSSDK.Core.xml\" target=\"lib\\net472\" />\r\n <file src=\".\\" +
"bin\\Release\\net472\\AWSSDK.Core.pdb\" target=\"lib\\net472\" />\r\n\r\n <file src=\".\\b" +
"in\\Release\\netstandard2.0\\AWSSDK.Core.dll\" target=\"lib\\netstandard2.0\"/>\r\n <f" +
"ile src=\".\\bin\\Release\\netstandard2.0\\AWSSDK.Core.xml\" target=\"lib\\netstandard2." +
"0\"/>\r\n <file src=\".\\bin\\Release\\netstandard2.0\\AWSSDK.Core.pdb\" target=\"lib\\n" +
Expand Down
8 changes: 4 additions & 4 deletions generator/ServiceClientGeneratorLib/Generators/NuGet/CoreNuspec.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<tags>AWS Amazon cloud aws-sdk-v4</tags>
<icon>images\AWSLogo.png</icon>
<dependencies>
<group targetFramework="net462">
<group targetFramework="net472">
<dependency id="System.Buffers" version="4.5.1" />
<dependency id="System.Memory" version="4.5.5" />
<dependency id="System.Text.Json" version="8.0.3" />
Expand All @@ -36,9 +36,9 @@
<file src="..\..\nuget-content\AWSLogo.png" target="images\" />
<file src="..\..\nuget-content\account-management.ps1" target="tools" />

<file src=".\bin\Release\net462\AWSSDK.Core.dll" target="lib\net462" />
<file src=".\bin\Release\net462\AWSSDK.Core.xml" target="lib\net462" />
<file src=".\bin\Release\net462\AWSSDK.Core.pdb" target="lib\net462" />
<file src=".\bin\Release\net472\AWSSDK.Core.dll" target="lib\net472" />
<file src=".\bin\Release\net472\AWSSDK.Core.xml" target="lib\net472" />
<file src=".\bin\Release\net472\AWSSDK.Core.pdb" target="lib\net472" />

<file src=".\bin\Release\netstandard2.0\AWSSDK.Core.dll" target="lib\netstandard2.0"/>
<file src=".\bin\Release\netstandard2.0\AWSSDK.Core.xml" target="lib\netstandard2.0"/>
Expand Down
Loading