Merge pull request aws#298 from aws/revert-297-release-v2.15.0

Revert "Release PR for v2.15.0"
jj22ee · May 7, 2024 · 04b8d38 · 04b8d38
2 parents 420c6f5 + 0802436
commit 04b8d38
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,28 +1,6 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## 2.15.0 (2024-05-02)
-### AWSXRayRecorder.Core (2.15.0)
-- No changes. Bumping to release with lateral related packages.
-
-### AWSXRayRecorder.Handlers.AspNet (2.12.0)
-- No changes. Bumping to release with lateral related packages.
-
-### AWSXRayRecorder.Handlers.AspNetCore (2.12.0)
-- No changes. Bumping to release with lateral related packages.
-
-### AWSXRayRecorder.Handlers.AwsSdk (2.13.0)
-- No changes. Bumping to release with lateral related packages.
-
-### AWSXRayRecorder.Handlers.EntityFramework (1.6.0)
-- No changes. Bumping to release with lateral related packages.
-
-### AWSXRayRecorder.Handlers.SqlServer (2.12.0)
-- Update System.Data.SqlClient version for CVE mitigation [#PR294](https://github.com/aws/aws-xray-sdk-dotnet/pull/294)
-
-### AWSXRayRecorder.Handlers.System.Net (2.12.0)
-- No changes. Bumping to release with lateral related packages.
-
 ## 2.14.0 (2023-02-28)
 ### AWSXRayRecorder.Core (2.14.0)
 - ec2plugin: fallback to utf8 if response encoding not set [#PR278](https://github.com/aws/aws-xray-sdk-dotnet/pull/278)

diff --git a/sdk/AWSXRayRecorder.nuspec b/sdk/AWSXRayRecorder.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>AWSXRayRecorder</id>
-    <version>2.15.0</version>
+    <version>2.14.0</version>
     <title>AWS X-Ray Recorder</title>
     <authors>AWS Web Service</authors>
     <licenseUrl>http://aws.amazon.com/apache2.0/</licenseUrl>
@@ -15,44 +15,44 @@
     <tags>AWS Amazon cloud AWSXRay XRay</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="AWSXRayRecorder.Core" version="2.15.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AspNet" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.13.0" />
-        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.6.0" />
-        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Core" version="2.14.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AspNet" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.5.0" />
+        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.11.0" />
       </group>
       <group targetFramework=".NETFramework4.6.2">
         <dependency id="AWSXRayRecorder.Core" version="2.14.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AspNet" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.13.0" />
-        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.6.0" />
-        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AspNet" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.5.0" />
+        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.11.0" />
       </group>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="AWSXRayRecorder.Core" version="2.15.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.13.0" />
-        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.6.0" />
-        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Core" version="2.14.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.5.0" />
+        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.11.0" />
       </group>
       <group targetFramework=".NETCoreApp3.1">
         <dependency id="AWSXRayRecorder.Core" version="2.14.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.13.0" />
-        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.6.0" />
-        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.5.0" />
+        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.11.0" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="AWSXRayRecorder.Core" version="2.15.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.13.0" />
-        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.6.0" />
-        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.12.0" />
-        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Core" version="2.14.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AspNetCore" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.AwsSdk" version="2.12.0" />
+        <dependency id="AWSXRayRecorder.Handlers.EntityFramework" version="1.5.0" />
+        <dependency id="AWSXRayRecorder.Handlers.SqlServer" version="2.11.0" />
+        <dependency id="AWSXRayRecorder.Handlers.System.Net" version="2.11.0" />
       </group>
     </dependencies>
     <frameworkReferences>

diff --git a/sdk/src/Core/AWSXRayRecorder.Core.csproj b/sdk/src/Core/AWSXRayRecorder.Core.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.15.0.0</AssemblyVersion>
-    <FileVersion>2.15.0.0</FileVersion>
-    <Version>2.15.0</Version>
+    <AssemblyVersion>2.14.0.0</AssemblyVersion>
+    <FileVersion>2.14.0.0</FileVersion>
+    <Version>2.14.0</Version>
     <RootNamespace>Amazon.XRay.Recorder.Core</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>

diff --git a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.12.0.0</AssemblyVersion>
-    <FileVersion>2.12.0.0</FileVersion>
-    <Version>2.12.0</Version>
+    <AssemblyVersion>2.11.0.0</AssemblyVersion>
+    <FileVersion>2.11.0.0</FileVersion>
+    <Version>2.11.0</Version>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.AspNet</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>

diff --git a/sdk/src/Handlers/AspNetCore/AWSXRayRecorder.Handlers.AspNetCore.csproj b/sdk/src/Handlers/AspNetCore/AWSXRayRecorder.Handlers.AspNetCore.csproj
@@ -4,9 +4,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.12.0.0</AssemblyVersion>
-    <FileVersion>2.12.0.0</FileVersion>
-    <Version>2.12.0</Version>
+    <AssemblyVersion>2.11.0.0</AssemblyVersion>
+    <FileVersion>2.11.0.0</FileVersion>
+    <Version>2.11.0</Version>
     <SignAssembly>true</SignAssembly>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.AspNetCore</RootNamespace>
     <AssemblyOriginatorKeyFile>../../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>

diff --git a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.13.0.0</AssemblyVersion>
-    <FileVersion>2.13.0.0</FileVersion>
-    <Version>2.13.0</Version>
+    <AssemblyVersion>2.12.0.0</AssemblyVersion>
+    <FileVersion>2.12.0.0</FileVersion>
+    <Version>2.12.0</Version>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.AwsSdk</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>

diff --git a/sdk/src/Handlers/EntityFramework/AWSXRayRecorder.Handlers.EntityFramework.csproj b/sdk/src/Handlers/EntityFramework/AWSXRayRecorder.Handlers.EntityFramework.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>1.6.0.0</AssemblyVersion>
-    <FileVersion>1.6.0.0</FileVersion>
-    <Version>1.6.0</Version>
+    <AssemblyVersion>1.5.0.0</AssemblyVersion>
+    <FileVersion>1.5.0.0</FileVersion>
+    <Version>1.5.0</Version>
     <AssemblyName>AWSXRayRecorder.Handlers.EntityFramework</AssemblyName>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.EntityFramework</RootNamespace>
     <Authors>Amazon Web Services</Authors>

diff --git a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.12.0.0</AssemblyVersion>
-    <FileVersion>2.12.0.0</FileVersion>
-    <Version>2.12.0</Version>
+    <AssemblyVersion>2.11.0.0</AssemblyVersion>
+    <FileVersion>2.11.0.0</FileVersion>
+    <Version>2.11.0</Version>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.SqlServer</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>

diff --git a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj
@@ -5,9 +5,9 @@
     <Company>Amazon.com, Inc</Company>
     <Product>Amazon Web Service X-Ray Recorder</Product>
     <Copyright>Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <AssemblyVersion>2.12.0.0</AssemblyVersion>
-    <FileVersion>2.12.0.0</FileVersion>
-    <Version>2.12.0</Version>
+    <AssemblyVersion>2.11.0.0</AssemblyVersion>
+    <FileVersion>2.11.0.0</FileVersion>
+    <Version>2.11.0</Version>
     <RootNamespace>Amazon.XRay.Recorder.Handlers.System.Net</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../../../buildtools/local-development.snk</AssemblyOriginatorKeyFile>