7.0.4

sec · Mar 17, 2023 · 19ea5c9 · 19ea5c9
1 parent 321924a
commit 19ea5c9
Show file tree

Hide file tree

Showing 5 changed files with 639 additions and 9 deletions.
diff --git a/build_aspnetcore.sh b/build_aspnetcore.sh
@@ -15,7 +15,7 @@ cp runtime/artifacts/packages/Release/Shipping/dotnet-runtime-*-freebsd-$ARCH.ta
 setenv PROTOBUF_PROTOC /usr/local/bin/protoc
 setenv PROTOBUF_TOOLS_CPU x64
 setenv PROTOBUF_TOOLS_OS linux
-setenv GRPC_PROTOC_PLUGIN /usr/local/bin
+setenv GRPC_PROTOC_PLUGIN /usr/local/bin/grpc_csharp_plugin
 
 service linux onestart
 

diff --git a/init.sh b/init.sh
@@ -29,9 +29,7 @@ if [ ! -d runtime ]; then
 
     runtime/.dotnet/dotnet nuget add source 'https://sec.github.io/dotnet-freebsd-nuget-feed/v3/index.json' --name ghsec --configfile runtime/NuGet.config
 
-    patch -d runtime < patches/runtime_versions.patch
-    patch -d runtime < patches/runtime_crossgen2.patch
-    patch -d runtime < patches/runtime_mono_configure.patch
+    patch -d runtime < patches/runtime.patch
 fi
 
 if [ ! -d aspnetcore ]; then

diff --git a/patches/aspnetcore.patch b/patches/aspnetcore.patch
@@ -1,3 +1,23 @@
+diff --git a/eng/Dependencies.props b/eng/Dependencies.props
+index 0d47cc0a11..69cbdacbe1 100644
+--- a/eng/Dependencies.props
++++ b/eng/Dependencies.props
+@@ -106,6 +106,7 @@ and are generated based on the last package release.
+     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" />
++    <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-arm64" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Condition=" '$(PortableBuild)' == 'false' " />
+
+     <!-- Crossgen2 compiler -->
+@@ -122,6 +123,7 @@ and are generated based on the last package release.
+     <LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm64" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-x64" />
++    <LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-arm64" />
+     <LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.$(TargetRuntimeIdentifier)" Condition=" '$(PortableBuild)' == 'false' " />
+   </ItemGroup>
+
 diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
 index 2db57db253..88306bafd0 100644
 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj

diff --git a/patches/installer.patch b/patches/installer.patch
@@ -1,35 +1,51 @@
 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
-index 304e3e258..f811c739e 100644
+index fc64d3a14..2ea8a32e9 100644
 --- a/src/redist/targets/GenerateBundledVersions.targets
 +++ b/src/redist/targets/GenerateBundledVersions.targets
-@@ -96,6 +96,7 @@
+@@ -131,6 +131,8 @@
            win-arm64;
            win-x64;
            win-x86;
 +	  freebsd-x64;
++      freebsd-arm64;
            " />
 
        <NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
-@@ -174,9 +175,10 @@
+@@ -232,9 +234,11 @@
          linux-x64;
          linux-arm;
          linux-arm64;
 +	freebsd-x64;
++    freebsd-arm64;
          " />
 
 -      <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
-+      <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64;freebsd-x64;" />
++      <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64;freebsd-x64;freebsd-arm64;" />
 
        <Net60Crossgen2SupportedRids Include="
            @(Net50Crossgen2SupportedRids);
-@@ -189,6 +191,7 @@
+@@ -247,6 +251,8 @@
            win-arm;
            win-arm64;
            win-x86;
 +	  freebsd-x64;
++      freebsd-arm64;
            " />
 
        <Crossgen2SupportedRids Include="@(Net60Crossgen2SupportedRids)" />
+diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
+index 6d216ff20..e4494395b 100644
+--- a/src/redist/targets/GetRuntimeInformation.targets
++++ b/src/redist/targets/GetRuntimeInformation.targets
+@@ -4,7 +4,7 @@
+       <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRid>
+       <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid>
+
+-      <IsLinux Condition = " $([MSBuild]::IsOSPlatform('LINUX')) ">True</IsLinux>
++      <IsLinux Condition = " $([MSBuild]::IsOSPlatform('LINUX')) AND ('$(OSName)' == '' OR '$(OSName)' == 'linux') ">True</IsLinux>
+       <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS')) ">win</HostOSName>
+       <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName>
+       <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName>
 diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets
 index eac457403..f01c618b1 100644
 --- a/src/redist/targets/SetBuildDefaults.targets