Changes to build v7 preview.4

Author: sec

README.md

@@ -6,13 +6,13 @@
 
 ## Usage
 
-1. Run as root `install_tools.sh`
+1. Run as root `install_tools.sh` - make sure to mount all needed things (add them to /etc/fstab, then mount -a)
 1. `init.sh`
 1. `build_runtime.sh` - add `-v d` inside if it will fail with SEHExceptions...
 1. (try to skip this and goto `build_aspnetcore.sh`) `build_installer_without_aspnet.sh`
 1. (try to skip this and goto `build_aspnetcore.sh`) run `tar zxfv ../../installer/artifacts/packages/Release/Shipping/dotnet-sdk-6.0.101-freebsd-x64.tar.gz` inside `aspnetcore/.dotnet` to extract newly created SDK
 1. `build_aspnetcore.sh` - as for now, this one need v7 SDK - grab one and do `./bsd_dotnet_install.sh sdk7.tgz aspnetcore/`
-1. `build_installer.sh`
+1. `build_installer.sh` - this one also need v7 SDK - do the same as above. Add `-v d` inside build script if it will fail, check the logs (maybe download some zips by hand, as this is common fail)
 1. Get and use `installer/artifacts/packages/Release/Shipping/dotnet-sdk-*-freebsd-x64.tar.gz`
 1. `clean.sh` if you want to save disk space after use
 1. `gather_output.sh` to tar artifacts into one big file, for future use (doesn't make sense to compress this, as it contains compressed files already)
@@ -47,4 +47,4 @@ More info about this [here](https://bugzilla.mozilla.org/show_bug.cgi?id=1686854
 
 - Check [releases](https://github.com/sec/dotnet-core-freebsd-source-build/releases) (issue me if someting's broken or missing)
 - [Crossbuild](https://github.com/Thefrank/dotnet-freebsd-crossbuild) and [native builds](https://github.com/Thefrank/dotnet-freebsd-native-binaries)
-- [Azure pipeline](https://github.com/Servarr/dotnet-bsd)
+- [Azure pipeline](https://github.com/Servarr/dotnet-bsd)

build_aspnetcore.sh

@@ -5,9 +5,10 @@ cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-x64.tar.
 
 # 20220209.13 - aspnet core - v7.0.0-preview.1.22109.13
 # 20220328.4 - aspnet core - v7.0.0-preview.3.22178.4
+# 20220501.1 - preview.4
 
 setenv PROTOBUF_PROTOC /usr/local/bin/protoc
 setenv PROTOBUF_TOOLS_CPU x64
 setenv PROTOBUF_TOOLS_OS linux
 
-aspnetcore/eng/build.sh -maxcpucount:1 /p:maxcpucount=1 -ci --os-name freebsd -pack /p:OfficialBuildId=20220328.4 -c Release --all
+aspnetcore/eng/build.sh -maxcpucount:1 /p:maxcpucount=1 -ci --os-name freebsd -pack /p:OfficialBuildId=20220501.1 -c Release --all

build_installer.sh

@@ -8,5 +8,6 @@ cp sdk/artifacts/packages/Release/NonShipping/dotnet-toolset-internal-*.zip inst
 # 20220210.4 - installer - v7.0.100-preview.1.22110.4
 # fetch dotnet-toolset-internal-7.0.100-preview.1.22110.5.zip by hand if fail ?
 # 20220329.4 - v7.0.100-preview.3.22179.4
+# 20220502.9 - preview.4
 
-installer/build.sh -c Release -ci -pack --runtime-id freebsd-x64 /p:OSName=freebsd /p:OfficialBuildId=20220329.4
+installer/build.sh -c Release -ci -pack --runtime-id freebsd-x64 /p:OSName=freebsd /p:OfficialBuildId=20220502.9 -v d

build_runtime.sh

@@ -2,5 +2,6 @@
 
 # 20220126.8 - runtime - v7.0.0-preview.1.22076.8
 # 20220325.4 - runtime - v7.0.0-preview.3.22175.4
+# 20220429.4 - runtime - preview.4
 
-runtime/build.sh --warnAsError false /p:OfficialBuildId=20220325.4 -ci -c Release
+runtime/build.sh --warnAsError false /p:OfficialBuildId=20220429.4 -ci -c Release

common.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+function calculate_build_id()
+{
+    local TAG=$1
+    local REGEX='-(preview|rc|rtm)\.[0-9]\.([0-9]{5})\.([0-9]{1,2})'
+
+    if [[ $TAG =~ $REGEX ]]
+    then
+        local MAJOR=${BASH_REMATCH[2]}
+        local MINOR=${BASH_REMATCH[3]}
+
+        YEAR=$((MAJOR / 1000 + 2000))
+        MONTH=$(((MAJOR % 1000) / 50))
+        DAY=$((MAJOR % 50))
+
+        DATE=$((YEAR * 10000 + MONTH * 100 + DAY))
+        
+        OFFICIALBUILDID="${DATE}.${MINOR}"
+    else
+        OFFICIALBUILDID=$(date +%Y%m%d).99
+    fi
+}
+
+function get_runtime_docker()
+{
+    DOTNET_DOCKER_TAG="mcr.microsoft.com/dotnet-buildtools/prereqs:$(curl -s https://raw.githubusercontent.com/dotnet/versions/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json | jq -r '.repos[0].images[] | select(.platforms[0].dockerfile | contains("freebsd/12")) | .platforms[0].simpleTags[0]')"
+}

gather_output.sh

@@ -6,4 +6,4 @@ find runtime/artifacts/packages/Release -name '*.nupkg' -exec cp '{}' output/ \;
 find aspnetcore/artifacts/packages/Release -name '*.nupkg' -exec cp '{}' output/ \;
 cp installer/artifacts/packages/Release/Shipping/* output/
 
-tar --create --file dotnet-sdk-7.0.0.preview.3-freebsd-x64-full.tar -C output .
+tar --create --file dotnet-sdk-7.0.100.preview.4-freebsd-x64-full.tar -C output .

init.sh

@@ -3,10 +3,10 @@
 SDKBIN="https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/6.0.202/dotnet-sdk-6.0.202-freebsd-x64.tar.gz"
 SDKZIP="sdk.tgz"
 
-RUNTIMETAG="v7.0.0-preview.3.22175.4"
-ASPNETCORETAG="v7.0.0-preview.3.22178.4"
-INSTALLERTAG="v7.0.100-preview.3.22179.4"
-SDKTAG="v7.0.100-preview.3.22179.3"
+RUNTIMETAG="v7.0.0-preview.4.22229.4"
+ASPNETCORETAG="v7.0.0-preview.4.22251.1"
+INSTALLERTAG="v7.0.100-preview.4.22252.9"
+SDKTAG="v7.0.100-preview.4.22252.4"
 
 #needed for openjdk
 #mount -t fdescfs fdesc /dev/fd
@@ -46,7 +46,7 @@ if [ ! -d aspnetcore ]; then
     ./bsd_dotnet_install.sh $SDKZIP aspnetcore
 
     aspnetcore/.dotnet/dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping/ --name local --configfile aspnetcore/NuGet.config
-	aspnetcore/.dotnet/dotnet nuget add source ../nuget --name local2 --configfile aspnetcore/NuGet.config
+    aspnetcore/.dotnet/dotnet nuget add source ../nuget --name local2 --configfile aspnetcore/NuGet.config
 
     patch -d aspnetcore < patches/aspnetcore.patch
 fi
@@ -63,6 +63,8 @@ if [ ! -d installer ]; then
     patch -d installer < patches/installer.patch
 fi
 
+exit
+
 if [ ! -d sdk ]; then
     git clone https://github.com/dotnet/sdk
     git -C sdk checkout $SDKTAG

patches/aspnetcore.patch

@@ -5,11 +5,11 @@ index c5686c0222..f8c8135511 100644
 @@ -1,9 +1,9 @@
  {
    "sdk": {
--    "version": "7.0.100-preview.3.22171.1"
+-    "version": "7.0.100-preview.4.22204.1"
 +    "version": "7.0.100-preview.1.22110.4"
    },
    "tools": {
--    "dotnet": "7.0.100-preview.3.22171.1",
+-    "dotnet": "7.0.100-preview.4.22204.1",
 +    "dotnet": "7.0.100-preview.1.22110.4",
      "runtimes": {
        "dotnet/x86": [

patches/installer.patch

@@ -1,22 +1,3 @@
-diff --git a/NuGet.config b/NuGet.config
-index d2a6d621d..8bf6c8b70 100644
---- a/NuGet.config
-+++ b/NuGet.config
-@@ -1,4 +1,4 @@
--<?xml version="1.0" encoding="utf-8"?>
-+<?xml version="1.0" encoding="utf-8"?>
- <configuration>
-   <solution>
-     <add key="disableSourceControlIntegration" value="true" />
-@@ -19,6 +19,8 @@
-     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-     <!-- Temporary feed for Xamarin workload manifest -->
-     <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
-+    <add key="local1" value="../runtime/artifacts/packages/Release/Shipping/" />
-+    <add key="local2" value="../aspnetcore/artifacts/packages/Release/Shipping/" />
-   </packageSources>
-   <disabledPackageSources>
-     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
 index 304e3e258..f811c739e 100644
 --- a/src/redist/targets/GenerateBundledVersions.targets

patches/runtime_versions.patch

@@ -1,19 +1,19 @@
 diff --git a/eng/Versions.props b/eng/Versions.props
-index dcc45d20b2e..ff9cb6c6d75 100644
+index 63a6ef6627f..f4fbc072af1 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
-@@ -66,11 +66,11 @@
+@@ -73,11 +73,11 @@
      <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
      <!-- Installer dependencies -->
-     <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.3.22163.2</MicrosoftNETCoreAppRuntimewinx64Version>
--    <MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreDotNetHostVersion>
--    <MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreDotNetHostPolicyVersion>
-+    <MicrosoftNETCoreDotNetHostVersion>6.0.4</MicrosoftNETCoreDotNetHostVersion>
-+    <MicrosoftNETCoreDotNetHostPolicyVersion>6.0.4</MicrosoftNETCoreDotNetHostPolicyVersion>
+     <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.4.22208.8</MicrosoftNETCoreAppRuntimewinx64Version>
+-    <MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.4.22208.8</MicrosoftNETCoreDotNetHostVersion>
+-    <MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.4.22208.8</MicrosoftNETCoreDotNetHostPolicyVersion>
++    <MicrosoftNETCoreDotNetHostVersion>6.0.2</MicrosoftNETCoreDotNetHostVersion>
++    <MicrosoftNETCoreDotNetHostPolicyVersion>6.0.2</MicrosoftNETCoreDotNetHostPolicyVersion>
      <MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
      <!-- CoreClr dependencies -->
--    <MicrosoftNETCoreILAsmVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreILAsmVersion>
-+    <MicrosoftNETCoreILAsmVersion>6.0.4-servicing.22220.99</MicrosoftNETCoreILAsmVersion>
-     <runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
-     <runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
-     <runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
+-    <MicrosoftNETCoreILAsmVersion>7.0.0-preview.4.22208.8</MicrosoftNETCoreILAsmVersion>
++    <MicrosoftNETCoreILAsmVersion>6.0.2-servicing.22117.99</MicrosoftNETCoreILAsmVersion>
+     <runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
+     <runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
+     <runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>