Update packages | Sept 24 (#2526)

* update to .net8 Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * update golang to 1.23.1 Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * update dockerfiles to use go 1.23.1 Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * update hugo version Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * publish buildscriptgen as self connect Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * revert buildpack deps for cli image Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * revert hugo version Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> * fix sample app Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com> --------- Signed-off-by: Sarthak Sharma <sartsharma@microsoft.com>
microsoft · Oct 16, 2024 · 98db7eb · 98db7eb
1 parent d535243
commit 98db7eb
Show file tree

Hide file tree

Showing 59 changed files with 348 additions and 356 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ x86/
 bld/
 [Oo]bj/
 [Ll]og/
+Binaries/
 
 # Visual Studio 2015 cache/options directory
 .vs/

diff --git a/build/testStartupScriptGenerators.sh b/build/testStartupScriptGenerators.sh
@@ -25,7 +25,7 @@ declare -r MODULE_TO_TEST="..."
 declare -r CONTAINER_NAME="oryxtests_$RANDOM"
 
 echo "Running tests in golang docker image..."
-docker run -v $GEN_DIR:$GEN_DIR_CONTAINER_RO:ro --name $CONTAINER_NAME mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye bash -c \
+docker run -v $GEN_DIR:$GEN_DIR_CONTAINER_RO:ro --name $CONTAINER_NAME mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye bash -c \
 	"cp -rf $GEN_DIR_CONTAINER_RO/* $GEN_DIR_CONTAINER && \
 	cd $GEN_DIR_CONTAINER && \
 	chmod u+x restorePackages.sh && \

diff --git a/build/tools/Automation/Automation.csproj b/build/tools/Automation/Automation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <!--Suppress XML comment related warns from failing builds-->
     <NoWarn>1570;1591</NoWarn>
   </PropertyGroup>

diff --git a/build/tools/SharedCodeGenerator/SharedCodeGenerator.csproj b/build/tools/SharedCodeGenerator/SharedCodeGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <HighEntropyVA>true</HighEntropyVA>
     <!-- Remove when proper XML documentation is added to the project. -->
     <DisableDocRequirement>true</DisableDocRequirement>

diff --git a/images/build/Dockerfiles/full.Dockerfile b/images/build/Dockerfiles/full.Dockerfile
@@ -2,7 +2,7 @@ ARG DEBIAN_FLAVOR
 
 ### oryx run-script image
 # DisableDockerDetector "Below image not yet supported in the Docker Hub mirror"
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-${DEBIAN_FLAVOR} as startupScriptGens
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-${DEBIAN_FLAVOR} as startupScriptGens
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/build/Dockerfiles/gitHubActions.Dockerfile b/images/build/Dockerfiles/gitHubActions.Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as buildscriptgenerator
+FROM mcr.microsoft.com/dotnet/sdk:8.0 as buildscriptgenerator
 
 ARG GIT_COMMIT=unspecified
 ARG BUILD_NUMBER=unspecified

diff --git a/images/build/build_buildimages.sh b/images/build/build_buildimages.sh
@@ -26,7 +26,7 @@ done
 
 # Update package list and install .NET SDK
 sudo apt-get update
-sudo apt-get install -y dotnet-sdk-7.0
+sudo apt-get install -y dotnet-sdk-8.0
 
 # build_image is githubactions, jamstack, cli
 build_image=$1;

diff --git a/images/runtime/dotnetcore/6.0/bullseye.Dockerfile b/images/runtime/dotnetcore/6.0/bullseye.Dockerfile
@@ -9,7 +9,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump
 RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 7.*
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/dotnetcore/8.0/bookworm.Dockerfile b/images/runtime/dotnetcore/8.0/bookworm.Dockerfile
@@ -9,7 +9,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump
 RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.*
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bookworm as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bookworm as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/dotnetcore/8.0/bullseye.Dockerfile b/images/runtime/dotnetcore/8.0/bullseye.Dockerfile
@@ -9,7 +9,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump
 RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.*
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/dotnetcore/9.0/bookworm.Dockerfile b/images/runtime/dotnetcore/9.0/bookworm.Dockerfile
@@ -9,7 +9,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump
 RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 9.0.0-preview.6.24352.10
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bookworm as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bookworm as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/node/18/bullseye.Dockerfile b/images/runtime/node/18/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/node/20/bookworm.Dockerfile b/images/runtime/node/20/bookworm.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bookworm as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bookworm as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/node/20/bullseye.Dockerfile b/images/runtime/node/20/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php-fpm/8.1/bullseye.Dockerfile b/images/runtime/php-fpm/8.1/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php-fpm/8.2/bullseye.Dockerfile b/images/runtime/php-fpm/8.2/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php-fpm/8.3/bookworm.Dockerfile b/images/runtime/php-fpm/8.3/bookworm.Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bookworm as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bookworm as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php-fpm/8.3/bullseye.Dockerfile b/images/runtime/php-fpm/8.3/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php/8.1/bullseye.Dockerfile b/images/runtime/php/8.1/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php/8.2/bullseye.Dockerfile b/images/runtime/php/8.2/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php/8.3/bookworm.Dockerfile b/images/runtime/php/8.3/bookworm.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bookworm as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bookworm as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/php/8.3/bullseye.Dockerfile b/images/runtime/php/8.3/bullseye.Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-bullseye as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as startupCmdGen
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src

diff --git a/images/runtime/python/template.Dockerfile b/images/runtime/python/template.Dockerfile
@@ -2,7 +2,7 @@ ARG DEBIAN_FLAVOR
 ARG BASE_IMAGE
 
 # Startup script generator
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-${DEBIAN_FLAVOR} as startupCmdGen
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-${DEBIAN_FLAVOR} as startupCmdGen
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src
 COPY src/startupscriptgenerator/src .

diff --git a/src/BuildScriptGenerator.Common/BuildScriptGenerator.Common.csproj b/src/BuildScriptGenerator.Common/BuildScriptGenerator.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Microsoft.Oryx.BuildScriptGenerator.Common</AssemblyName>
     <RootNamespace>Microsoft.Oryx.BuildScriptGenerator.Common</RootNamespace>
     <LangVersion>7.3</LangVersion>

diff --git a/src/BuildScriptGenerator/BuildScriptGenerator.csproj b/src/BuildScriptGenerator/BuildScriptGenerator.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Microsoft.Oryx.BuildScriptGenerator</AssemblyName>
     <RootNamespace>Microsoft.Oryx.BuildScriptGenerator</RootNamespace>
+    <SelfContained>true</SelfContained>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />

diff --git a/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj b/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeFrameworkVersion>7.0</RuntimeFrameworkVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeFrameworkVersion>8.0</RuntimeFrameworkVersion>
     <AssemblyName>GenerateBuildScript</AssemblyName>
     <RootNamespace>Microsoft.Oryx.BuildScriptGeneratorCli</RootNamespace>
     <OutputType>Exe</OutputType>

diff --git a/src/BuildServer/BuildServer.csproj b/src/BuildServer/BuildServer.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
+    <SelfContained>true</SelfContained>
     <AssemblyOriginatorKeyFile>..\..\build\FinalPublicKey.snk</AssemblyOriginatorKeyFile>
     <AssemblyName>Microsoft.Oryx.BuildServer</AssemblyName>
     <RootNamespace>Microsoft.Oryx.BuildServer</RootNamespace>
@@ -20,4 +21,15 @@
     <PackageReference Include="RunProcessAsTask" Version="1.2.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.Compilers" Version="4.12.0-2.final">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="4.12.0-2.final">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Detector/Detector.csproj b/src/Detector/Detector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>Microsoft.Oryx.Detector</AssemblyName>
     <RootNamespace>Microsoft.Oryx.Detector</RootNamespace>
@@ -33,7 +33,7 @@
   <ItemGroup>
     <_PackageFiles Include="$(OutputPath)\Microsoft.Oryx.Common.dll">
       <BuildAction>None</BuildAction>
-      <PackagePath>lib\net7.0\</PackagePath>
+      <PackagePath>lib\net8.0\</PackagePath>
     </_PackageFiles>
   </ItemGroup>
 

diff --git a/src/Detector/Detector.signproj b/src/Detector/Detector.signproj
@@ -7,7 +7,7 @@
         Condition="'$(MicroBuild_SigningEnabled)'=='true'" />
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutDir>$(MSBuildThisFileDirectory)bin\Release</OutDir>
         <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\build\FinalPublicKey.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>

diff --git a/src/Oryx.Common/Common.csproj b/src/Oryx.Common/Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Microsoft.Oryx.Common</AssemblyName>
     <RootNamespace>Microsoft.Oryx.BuildScriptGenerator</RootNamespace>
     <SignAssembly>true</SignAssembly>

diff --git a/src/startupscriptgenerator/src/common/go.mod b/src/startupscriptgenerator/src/common/go.mod
@@ -1,36 +1,36 @@
 module common
 
-go 1.20
+go 1.23.1
 
 require (
-	github.com/BurntSushi/toml v1.3.2
+	github.com/BurntSushi/toml v1.4.0
 	github.com/google/uuid v1.6.0
 	github.com/microsoft/ApplicationInsights-Go v0.4.4
-	github.com/spf13/viper v1.18.2
+	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
-	code.cloudfoundry.org/clock v1.1.0 // indirect
+	code.cloudfoundry.org/clock v1.13.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )