Skip to content

Update Oryx feature to install if a newer version of .NET is present #769

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

Closed
seesharprun wants to merge 6 commits into from
Closed

Update Oryx feature to install if a newer version of .NET is present #769

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c11e76
Update install.sh
seesharprun Nov 30, 2023
9096b95
Fixed .NET 7 detection logic
seesharprun Nov 30, 2023
56e1cc9
Merge branch 'main' into patch-1
seesharprun Jan 16, 2024
df8c823
Merge branch 'main' into patch-1
seesharprun Jan 22, 2024
4bb1757
Merge branch 'main' into patch-1
seesharprun Jan 29, 2024
2f61e28
Merge branch 'main' into patch-1
samruddhikhandale Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/oryx/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ if dotnet --version > /dev/null ; then
fi

# Oryx needs to be built with .NET 7
if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --version)" != *"7"* ]] ; then
echo "'dotnet 7' was not detected. Attempting to install .NET 7 to build oryx."
if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --list-sdks)" != *"7.0."* ]] ; then
echo "'.NET 7.0.x' was not detected. Attempting to install .NET 7 to build oryx."
install_dotnet_using_apt

if ! dotnet --version > /dev/null ; then
echo "(!) Please install Dotnet before installing Oryx"
echo "(!) Please install .NET before installing Oryx"
exit 1
fi

Expand All @@ -158,10 +158,10 @@ SOLUTION_FILE_NAME="Oryx.sln"
echo "Building solution '$SOLUTION_FILE_NAME'..."

cd $GIT_ORYX
${DOTNET_BINARY} build "$SOLUTION_FILE_NAME" -c Debug
${DOTNET_BINARY} build --configuration Debug --framework net7.0 "$SOLUTION_FILE_NAME"

${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj
${DOTNET_BINARY} publish --configuration Release --runtime linux-x64 --output ${BUILD_SCRIPT_GENERATOR} --framework net7.0 --self-contained -property:ValidateExecutableReferencesMatchSelfContained=false $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
${DOTNET_BINARY} publish --configuration Release --runtime linux-x64 --output ${BUILD_SCRIPT_GENERATOR} --framework net7.0 --self-contained $GIT_ORYX/src/BuildServer/BuildServer.csproj

chmod a+x ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript

Expand Down