Skip to content

Commit

Permalink
support for .net 6 rtm (microsoft#1147)
Browse files Browse the repository at this point in the history 
* update

* update

* update

* update

* update

* update dotnet-monitor to rc/rtm

* update dotnetcore runtime tag

* update

* update
  • Loading branch information
@arroyc
arroyc authored Nov 1, 2021
1 parent 369b946 commit af0f533
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 24 deletions.
10 changes: 5 additions & 5 deletions build/__dotNetCoreRunTimeVersions.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was auto-generated from 'constants.yaml'. Changes may be overridden.

DOT_NET_CORE_RUNTIME_BASE_TAG='20211027.5'
DOT_NET_CORE_RUNTIME_BASE_TAG='20211031.2'
NET_CORE_APP_10='1.0.16'
NET_CORE_APP_11='1.1.13'
NET_CORE_APP_20='2.0.9'
Expand All @@ -22,7 +22,7 @@ NET_CORE_APP_50='5.0.9'
NET_CORE_APP_50_SHA='454a11d87199be6fcd5f97f28b0f9c2f15c0288dd0759dc96ac2c730697b9e6514a19bbfc06185ccb4289dd11681ea5e9cfaf6f3676040e36d21e9b90282af8d'
ASPNET_CORE_APP_50='5.0.9'
ASPNET_CORE_APP_50_SHA='67ac99b8f631684961aa2e887ed5d6b9cc301b06a1842ac212791860bf6de145831228df5f57eca8a97e16e569e7b5a308fd20d82f11569c375c689fc932dfff'
NET_CORE_APP_60='6.0.0-rc.2.21480.5'
NET_CORE_APP_60_SHA='45062417c6111af4d635868927e8f69d43f66c9e0f111cb71c1861eaf5ceda4aefa99d97c6ce3b13fac2bc7c57c435e6f8b2d43c51a3bb3304b42081d98f7047'
ASPNET_CORE_APP_60='6.0.0-rc.2.21480.10'
ASPNET_CORE_APP_60_SHA='d48895237644a3999663b2e16baa2303d8b77f66385a04d8edb5601fdffacce18b1b1318827d09f74f6b133ff2c179ef659bd21cf8460289b5f81f404fa8b326'
NET_CORE_APP_60='6.0.0'
NET_CORE_APP_60_SHA='7cc8d93f9495b516e1b33bf82af3af605f1300bcfeabdd065d448cc126bd97ab4da5ec5e95b7775ee70ab4baf899ff43671f5c6f647523fb41cda3d96f334ae5'
ASPNET_CORE_APP_60='6.0.0'
ASPNET_CORE_APP_60_SHA='6a1ae878efdc9f654e1914b0753b710c3780b646ac160fb5a68850b2fd1101675dc71e015dbbea6b4fcf1edac0822d3f7d470e9ed533dd81d0cfbcbbb1745c6c'
1 change: 1 addition & 0 deletions build/__dotNetCoreSdkVersions.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ DOT_NET_CORE_31_SDK_VERSION='3.1.412'
DOT_NET_CORE_50_SDK_VERSION='5.0.302'
DOT_NET_50_SDK_VERSION='5.0.400'
DOT_NET_60_SDK_VERSION='6.0.100-rc.2.21505.57'
DOT_NET_60_RTM_SDK_VERSION='6-0-100-rtm-21527-11'
12 changes: 7 additions & 5 deletions build/constants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
dot-net-core-50-sdk-version: 5.0.302
dot-net-50-sdk-version: 5.0.400
dot-net-60-sdk-version: 6.0.100-rc.2.21505.57
dot-net-60-rtm-sdk-version: 6-0-100-rtm-21527-11
outputs:
- type: csharp
directory: src/BuildScriptGenerator/DotNetCore
Expand All @@ -40,7 +41,7 @@
file-name-prefix: __
- name: dot-net-core-run-time-versions
constants:
dot-net-core-runtime-base-tag: 20211027.5
dot-net-core-runtime-base-tag: 20211031.2
net-core-app-10: 1.0.16
net-core-app-11: 1.1.13

Expand Down Expand Up @@ -69,11 +70,11 @@
aspnet-core-app-50: 5.0.9
aspnet-core-app-50-sha: 67ac99b8f631684961aa2e887ed5d6b9cc301b06a1842ac212791860bf6de145831228df5f57eca8a97e16e569e7b5a308fd20d82f11569c375c689fc932dfff

net-core-app-60: 6.0.0-rc.2.21480.5
net-core-app-60-sha: 45062417c6111af4d635868927e8f69d43f66c9e0f111cb71c1861eaf5ceda4aefa99d97c6ce3b13fac2bc7c57c435e6f8b2d43c51a3bb3304b42081d98f7047
net-core-app-60: 6.0.0
net-core-app-60-sha: 7cc8d93f9495b516e1b33bf82af3af605f1300bcfeabdd065d448cc126bd97ab4da5ec5e95b7775ee70ab4baf899ff43671f5c6f647523fb41cda3d96f334ae5

aspnet-core-app-60: 6.0.0-rc.2.21480.10
aspnet-core-app-60-sha: d48895237644a3999663b2e16baa2303d8b77f66385a04d8edb5601fdffacce18b1b1318827d09f74f6b133ff2c179ef659bd21cf8460289b5f81f404fa8b326
aspnet-core-app-60: 6.0.0
aspnet-core-app-60-sha: 6a1ae878efdc9f654e1914b0753b710c3780b646ac160fb5a68850b2fd1101675dc71e015dbbea6b4fcf1edac0822d3f7d470e9ed533dd81d0cfbcbbb1745c6c


outputs:
Expand Down Expand Up @@ -175,6 +176,7 @@
run-script-generator-dir: /opt/startupcmdgen
node-app-insights-loader-file-name: applicationinsights/out/Bootstrap/Oryx.js
node-global-modules-path: /usr/local/lib/node_modules
logger-path: /opt/oryx/logger
bash: /bin/bash
benv: /opt/oryx/benv
pre-run-command-env-var-name: PRE_RUN_COMMAND
Expand Down
3 changes: 1 addition & 2 deletions images/build/Dockerfiles/azureFunctions.JamStack.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ RUN oryx prep --skip-detection --platforms-and-versions nodejs=12 \
&& cd /opt/dotnet \
&& ln -s $DOT_NET_CORE_31_SDK_VERSION 3-lts \
&& ln -s 3-lts lts \
&& echo "jamstack" > /opt/oryx/.imagetype \
&& . /tmp/build/__goVersions.sh \
&& downloadedFileName="go${GO_VERSION}.linux-amd64.tar.gz" \
&& ${IMAGES_DIR}/retry.sh "curl -SLsO https://golang.org/dl/$downloadedFileName" \
Expand Down Expand Up @@ -64,5 +63,5 @@ RUN set -ex \
&& ln -s $PYTHON38_VERSION latest \
&& ln -s $PYTHON38_VERSION stable \
&& echo "jamstack" > /opt/oryx/.imagetype

RUN ./opt/tmp/build/createSymlinksForDotnet.sh
2 changes: 1 addition & 1 deletion images/runtime/dotnetcore/6.0/base.buster.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace
RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump
RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters
RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump
RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --add-source https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5-transport/nuget/v3/index.json --version 6.0.0-preview.8*
RUN dotnet tool install --tool-path /dotnetcore-tools --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools%40Local/nuget/v3/index.json --version 6.0.0-rtm.* dotnet-monitor

FROM debian:buster-slim
ARG BUILD_DIR=/tmp/oryx/build
Expand Down
1 change: 1 addition & 0 deletions platforms/dotnet/getDotNetSdk.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ getDotNetCoreSdk() {
curl -SL $downloadUrl --output "$downloadedFile"
echo "Verifying archive hash..."
echo "$sha $downloadedFile" | sha512sum -c -

# Find the runtime version
tar -xzf $downloadedFile -C .
runtimeVersionDir=$(find "$tempDir/shared/Microsoft.NETCore.App" -mindepth 1 -maxdepth 1 -type d)
Expand Down
2 changes: 2 additions & 0 deletions platforms/dotnet/versionsToBuild.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@

6.0.100-rc.2.21505.57, 0a8f85a2757f61ca7f9b8c546af4554c2aac9cdb06f6d62879a60de6f2a3d37ea7136f48896c9c85828a2d55df354e7b9b5b4dc22896c927f0c6370a5ade1b9c,

6.0.100-rtm.21524.1, CB0D174A79D6294C302261B645DBA6A479DA8F7CF6C1FE15AE6998BC09C5E0BAEC810822F9E0104E84B0EFD51FDC0333306CB2A0A6FCDBAF515A8AD8CF1AF25B, https://dotnetstage.blob.core.windows.net/6-0-100-rtm-21527-11-public/Sdk/6.0.100-rtm.21527.11/dotnet-sdk-6.0.100-linux-x64.tar.gz

# NOTE: Make sure to set the default version in 'defaultVersion.txt' file
2 changes: 1 addition & 1 deletion src/BuildScriptGenerator.Common/FilePaths.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ public static class FilePaths
public const string RunScriptGeneratorDir = "/opt/startupcmdgen";
public const string NodeAppInsightsLoaderFileName = "applicationinsights/out/Bootstrap/Oryx.js";
public const string NodeGlobalModulesPath = "/usr/local/lib/node_modules";
public const string LoggerPath = "/opt/oryx/logger";
public const string Bash = "/bin/bash";
public const string Benv = "/opt/oryx/benv";
public const string Logger = "/opt/oryx/logger";
public const string PreRunCommandEnvVarName = "PRE_RUN_COMMAND";
}
}
2 changes: 1 addition & 1 deletion src/BuildScriptGenerator/DefaultBuildScriptGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ private string BuildScriptFromSnippets(
BuildCommandsFileName = context.BuildCommandsFileName,
BuildProperties = buildProperties,
BenvPath = FilePaths.Benv,
LoggerPath = FilePaths.Logger,
LoggerPath = FilePaths.LoggerPath,
PlatformInstallationScript = installationScript,
OutputDirectoryIsNested = outputIsSubDirOfSourceDir,
CopySourceDirectoryContentToDestinationDirectory = copySourceDirectoryContentToDestinationDirectory,
Expand Down
10 changes: 5 additions & 5 deletions src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
{
public static class DotNetCoreRunTimeVersions
{
public const string DotNetCoreRuntimeBaseTag = "20211027.5";
public const string DotNetCoreRuntimeBaseTag = "20211031.2";
public const string NetCoreApp10 = "1.0.16";
public const string NetCoreApp11 = "1.1.13";
public const string NetCoreApp20 = "2.0.9";
Expand All @@ -26,9 +26,9 @@ public static class DotNetCoreRunTimeVersions
public const string NetCoreApp50Sha = "454a11d87199be6fcd5f97f28b0f9c2f15c0288dd0759dc96ac2c730697b9e6514a19bbfc06185ccb4289dd11681ea5e9cfaf6f3676040e36d21e9b90282af8d";
public const string AspnetCoreApp50 = "5.0.9";
public const string AspnetCoreApp50Sha = "67ac99b8f631684961aa2e887ed5d6b9cc301b06a1842ac212791860bf6de145831228df5f57eca8a97e16e569e7b5a308fd20d82f11569c375c689fc932dfff";
public const string NetCoreApp60 = "6.0.0-rc.2.21480.5";
public const string NetCoreApp60Sha = "45062417c6111af4d635868927e8f69d43f66c9e0f111cb71c1861eaf5ceda4aefa99d97c6ce3b13fac2bc7c57c435e6f8b2d43c51a3bb3304b42081d98f7047";
public const string AspnetCoreApp60 = "6.0.0-rc.2.21480.10";
public const string AspnetCoreApp60Sha = "d48895237644a3999663b2e16baa2303d8b77f66385a04d8edb5601fdffacce18b1b1318827d09f74f6b133ff2c179ef659bd21cf8460289b5f81f404fa8b326";
public const string NetCoreApp60 = "6.0.0";
public const string NetCoreApp60Sha = "7cc8d93f9495b516e1b33bf82af3af605f1300bcfeabdd065d448cc126bd97ab4da5ec5e95b7775ee70ab4baf899ff43671f5c6f647523fb41cda3d96f334ae5";
public const string AspnetCoreApp60 = "6.0.0";
public const string AspnetCoreApp60Sha = "6a1ae878efdc9f654e1914b0753b710c3780b646ac160fb5a68850b2fd1101675dc71e015dbbea6b4fcf1edac0822d3f7d470e9ed533dd81d0cfbcbbb1745c6c";
}
}
1 change: 1 addition & 0 deletions src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ public static class DotNetCoreSdkVersions
public const string DotNetCore50SdkVersion = "5.0.302";
public const string DotNet50SdkVersion = "5.0.400";
public const string DotNet60SdkVersion = "6.0.100-rc.2.21505.57";
public const string DotNet60RtmSdkVersion = "6-0-100-rtm-21527-11";
}
}
1 change: 1 addition & 0 deletions src/startupscriptgenerator/src/common/consts/file_paths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const BuildCommandsFileName string = "oryx-build-commands.txt"
const RunScriptGeneratorDir string = "/opt/startupcmdgen"
const NodeAppInsightsLoaderFileName string = "applicationinsights/out/Bootstrap/Oryx.js"
const NodeGlobalModulesPath string = "/usr/local/lib/node_modules"
const LoggerPath string = "/opt/oryx/logger"
const Bash string = "/bin/bash"
const Benv string = "/opt/oryx/benv"
const PreRunCommandEnvVarName string = "PRE_RUN_COMMAND"
3 changes: 2 additions & 1 deletion tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreSampleAppsTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ public void Builds_Net6BlazorWasmApp_RunsAOTCompilationInstallCommands()
var appDir = volume.ContainerDir;
var script = new ShellScriptBuilder()
.AddDefaultTestEnvironmentVariables()
.AddCommand("dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21527.11-shipping/nuget/v3/index.json")
.AddBuildCommand(
$"{appDir} --platform dotnet " +
$"--platform-version 6")
Expand Down Expand Up @@ -754,7 +755,7 @@ public void Builds_AzureFunctionProject_FromBlazorFunctionRepo_When_Apptype_Is_S
var script = new ShellScriptBuilder()
.AddBuildCommand(
$"{appDir}/MessageFunction -o {appOutputDir} --apptype functions --platform dotnet " +
$"--platform-version 3.1.8")
$"--platform-version 3.1")
.AddFileExistsCheck($"{appOutputDir}/{FilePaths.BuildManifestFileName}")
.ToString();

Expand Down
6 changes: 3 additions & 3 deletions tests/SampleApps/DotNetCore/NetCore50IsolatedApp/NetCoreApp50Isolated.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<RootNamespace>netcore50isolatedapp</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.12" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.0.1" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.5.2" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down

0 comments on commit af0f533

Please sign in to comment.