Merge remote-tracking branch 'upstream/main' into zhaez/gen-ai-support

ezhang6811 · ezhang6811 · commit 387fefff9809 · 2024-11-06T21:50:22.000Z
diff --git a/build/Build.InstallationScripts.cs b/build/Build.InstallationScripts.cs
@@ -8,7 +8,7 @@
 internal partial class Build : NukeBuild
 {
     private readonly AbsolutePath installationScriptsFolder = RootDirectory / "bin" / "InstallationScripts";
-    private readonly string version = "1.3.2.dev0";
+    private readonly string version = "1.4.0.dev0";
 
     public Target BuildInstallationScripts => _ => _
         .After(this.Clean)
diff --git a/src/AWS.Distro.OpenTelemetry.AutoInstrumentation/Version.cs b/src/AWS.Distro.OpenTelemetry.AutoInstrumentation/Version.cs
@@ -5,5 +5,5 @@ namespace AWS.Distro.OpenTelemetry.AutoInstrumentation;
 
 static class Version
 {
-    public static string version = "1.3.2.dev0";
+    public static string version = "1.4.0.dev0";
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`internal partial class Build : NukeBuild`
`9`	`9`	`{`
`10`	`10`	`private readonly AbsolutePath installationScriptsFolder = RootDirectory / "bin" / "InstallationScripts";`
`11`		`- private readonly string version = "1.3.2.dev0";`
	`11`	`+ private readonly string version = "1.4.0.dev0";`
`12`	`12`
`13`	`13`	`public Target BuildInstallationScripts => _ => _`
`14`	`14`	`.After(this.Clean)`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ namespace AWS.Distro.OpenTelemetry.AutoInstrumentation;`
`5`	`5`
`6`	`6`	`static class Version`
`7`	`7`	`{`
`8`		`- public static string version = "1.3.2.dev0";`
	`8`	`+ public static string version = "1.4.0.dev0";`
`9`	`9`	`}`