dotnet6.0 was removed due to minimization efforts prior to public launch
This commit is contained in:
Yaakov Selkowitz
parent
2dbfe7c2df
commit
530f17abd0
39
.gitignore
vendored
39
.gitignore
vendored
@ -1,39 +0,0 @@
|
|||||||
/dotnet-v3.1.101-SDK.tar.gz
|
|
||||||
/dotnet-v3.1.102-SDK.tar.gz
|
|
||||||
/dotnet-v3.1.103.2-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.102-SDK-arm64-bootstrap.tar.gz
|
|
||||||
/dotnet-v5.0.102-SDK-x64-bootstrap.tar.gz
|
|
||||||
/dotnet-v5.0.102-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.103-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.104-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.202-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.203-SDK.tar.gz
|
|
||||||
/dotnet-v5.0.204-SDK.tar.gz
|
|
||||||
/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c-x64-bootstrap.tar.xz
|
|
||||||
/dotnet-arm64-prebuilts-2021-10-29.tar.gz
|
|
||||||
/dotnet-s390x-prebuilts-2021-10-29.tar.gz
|
|
||||||
/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz
|
|
||||||
/dotnet-v6.0.101.tar.gz
|
|
||||||
/dotnet-v6.0.102.tar.gz
|
|
||||||
/dotnet-v6.0.103.tar.gz
|
|
||||||
/dotnet-v6.0.104.tar.gz
|
|
||||||
/dotnet-v6.0.105.tar.gz
|
|
||||||
/dotnet-v6.0.106.tar.gz
|
|
||||||
/dotnet-v6.0.107.tar.gz
|
|
||||||
/dotnet-v6.0.108.tar.gz
|
|
||||||
/dotnet-v6.0.109.tar.gz
|
|
||||||
/dotnet-v6.0.110.tar.gz
|
|
||||||
/dotnet-v6.0.111.tar.gz
|
|
||||||
/dotnet-v6.0.112.tar.gz
|
|
||||||
/dotnet-v6.0.113.tar.gz
|
|
||||||
/dotnet-v6.0.114.tar.gz
|
|
||||||
/dotnet-v6.0.115.tar.gz
|
|
||||||
/dotnet-v6.0.116.tar.gz
|
|
||||||
/dotnet-v6.0.118.tar.gz
|
|
||||||
/dotnet-v6.0.120.tar.gz
|
|
||||||
/dotnet-v6.0.121.tar.gz
|
|
||||||
/dotnet-v6.0.122.tar.gz
|
|
||||||
/dotnet-v6.0.123.tar.gz
|
|
||||||
/dotnet-v6.0.124.tar.gz
|
|
||||||
/dotnet-v6.0.125.tar.gz
|
|
||||||
/dotnet-v6.0.126.tar.gz
|
|
||||||
137
README.md
137
README.md
@ -1,137 +0,0 @@
|
|||||||
# dotnet6.0
|
|
||||||
|
|
||||||
This is the .NET 6.0 package for Fedora.
|
|
||||||
|
|
||||||
This package is maintained by the Fedora DotNet SIG (Special Interest
|
|
||||||
Group). You can find out more about the DotNet SIG at:
|
|
||||||
|
|
||||||
- https://fedoraproject.org/wiki/SIGs/DotNet
|
|
||||||
- https://fedoraproject.org/wiki/DotNet
|
|
||||||
- https://lists.fedoraproject.org/archives/list/dotnet-sig@lists.fedoraproject.org/
|
|
||||||
|
|
||||||
Please report any issues [using
|
|
||||||
bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dotnet6.0).
|
|
||||||
|
|
||||||
# Specification
|
|
||||||
|
|
||||||
This package follows [package naming and contents suggested by
|
|
||||||
upstream](https://docs.microsoft.com/en-us/dotnet/core/build/distribution-packaging),
|
|
||||||
with one exception. It installs dotnet to `/usr/lib64/dotnet` (aka
|
|
||||||
`%{_libdir}`).
|
|
||||||
|
|
||||||
# Contributing
|
|
||||||
|
|
||||||
The steps below are for the final package. Please only contribute to this
|
|
||||||
pre-release version this if you know what you are doing. Original instructions
|
|
||||||
follow.
|
|
||||||
|
|
||||||
## General Changes
|
|
||||||
|
|
||||||
1. Fork the repo.
|
|
||||||
|
|
||||||
2. Checkout the forked repository.
|
|
||||||
|
|
||||||
- `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet6.0.git`
|
|
||||||
- `cd dotnet6.0`
|
|
||||||
|
|
||||||
3. Make your changes. Don't forget to add a changelog.
|
|
||||||
|
|
||||||
4. Do local builds.
|
|
||||||
|
|
||||||
- `fedpkg local`
|
|
||||||
|
|
||||||
5. Fix any errors that come up and rebuild until it works locally.
|
|
||||||
|
|
||||||
6. Do builds in koji.
|
|
||||||
|
|
||||||
- `fedpkg scratch-build --srpm`
|
|
||||||
|
|
||||||
8. Commit the changes to the git repo.
|
|
||||||
|
|
||||||
- `git add` any new patches
|
|
||||||
- `git remove` any now-unnecessary patches
|
|
||||||
- `git commit -a`
|
|
||||||
- `git push`
|
|
||||||
|
|
||||||
9. Create a pull request with your changes.
|
|
||||||
|
|
||||||
10. Once the tests in the pull-request pass, and reviewers are happy, do a real
|
|
||||||
build.
|
|
||||||
|
|
||||||
- `fedpkg build`
|
|
||||||
|
|
||||||
11. For non-rawhide releases, file updates using bodhi to ship the just-built
|
|
||||||
package out to users.
|
|
||||||
|
|
||||||
- https://bodhi.fedoraproject.org/updates/new
|
|
||||||
|
|
||||||
OR
|
|
||||||
|
|
||||||
- `fedpkg update`
|
|
||||||
|
|
||||||
## Updating to an new upstream release
|
|
||||||
|
|
||||||
1. Fork the repo.
|
|
||||||
|
|
||||||
2. Checkout the forked repository.
|
|
||||||
|
|
||||||
- `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet6.0.git`
|
|
||||||
- `cd dotnet6.0`
|
|
||||||
|
|
||||||
3. Build the new upstream source tarball. Update the versions in the
|
|
||||||
spec file. Add a changelog. This is generally automated by the
|
|
||||||
following.
|
|
||||||
|
|
||||||
- `./update-release <sdk-version> <runtime-version>`
|
|
||||||
|
|
||||||
If this fails because of compiler errors, you might have to figure
|
|
||||||
out a fix, then add the patch in `build-dotnet-tarball` script
|
|
||||||
rather than the spec file.
|
|
||||||
|
|
||||||
4. Do local builds.
|
|
||||||
|
|
||||||
- `fedpkg local`
|
|
||||||
|
|
||||||
5. Fix any errors that come up and rebuild until it works locally. Any
|
|
||||||
patches that are needed at this point should be added to the spec file.
|
|
||||||
|
|
||||||
6. Do builds in koji.
|
|
||||||
|
|
||||||
- `fedpkg scratch-build --srpm`
|
|
||||||
|
|
||||||
7. Upload the source archive to the Fedora look-aside cache.
|
|
||||||
|
|
||||||
- `fedpkg new-sources path-to-generated-dotnet-source-tarball.tar.gz`
|
|
||||||
|
|
||||||
8. Commit the changes to the git repo.
|
|
||||||
|
|
||||||
- `git add` any new patches
|
|
||||||
- `git remove` any now-unnecessary patches
|
|
||||||
- `git commit -a`
|
|
||||||
- `git push`
|
|
||||||
|
|
||||||
9. Create a pull request with your changes.
|
|
||||||
|
|
||||||
10. Once the tests in the pull-request pass, and reviewers are happy, do a real
|
|
||||||
build.
|
|
||||||
|
|
||||||
- `fedpkg build`
|
|
||||||
|
|
||||||
11. For non-rawhide releases, file updates using bodhi to ship the just-built
|
|
||||||
package out to users.
|
|
||||||
|
|
||||||
- https://bodhi.fedoraproject.org/updates/new
|
|
||||||
|
|
||||||
OR
|
|
||||||
|
|
||||||
- `fedpkg update`
|
|
||||||
|
|
||||||
# Testing
|
|
||||||
|
|
||||||
This package uses CI tests as defined in `tests/test.yml`. Creating a
|
|
||||||
pull-request or running a build will fire off tests and flag any issues. We have
|
|
||||||
enabled gating (via `gating.yaml`) on the tests. That prevents a build
|
|
||||||
that fails any test from being released until the failures are waived.
|
|
||||||
|
|
||||||
The tests themselves are contained in this external repository:
|
|
||||||
https://github.com/redhat-developer/dotnet-regular-tests/
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
Index: a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
|
|
||||||
===================================================================
|
|
||||||
--- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
|
|
||||||
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
<ToolCommandName>dotnet-swaggergen</ToolCommandName>
|
|
||||||
<SignAssembly>false</SignAssembly>
|
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
Index: a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
|
|
||||||
===================================================================
|
|
||||||
--- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
|
|
||||||
+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
<VersionPrefix>2.5.1</VersionPrefix>
|
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
|
||||||
<RollForward>Major</RollForward>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
bootstrap_dir=$(readlink -f "$1")
|
|
||||||
|
|
||||||
version=$(jq -r '.tools.dotnet' "$bootstrap_dir"/global.json)
|
|
||||||
|
|
||||||
date=$(date +%F)
|
|
||||||
|
|
||||||
mkdir -p "dotnet-arm64-prebuilts-$date"
|
|
||||||
|
|
||||||
pushd "dotnet-arm64-prebuilts-$date"
|
|
||||||
|
|
||||||
# Getting the exact matching rc2 version gets us an arm64 build without this
|
|
||||||
# fix https://github.com/dotnet/runtime/pull/58959. That causes a segfault on
|
|
||||||
# startup.
|
|
||||||
# wget "https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz"
|
|
||||||
|
|
||||||
wget https://aka.ms/dotnet/6.0.1XX-rc2/daily/dotnet-sdk-linux-arm64.tar.gz
|
|
||||||
|
|
||||||
mapfile -t linux_x64_packages < <(tar tf "$bootstrap_dir"/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz | grep linux-x64)
|
|
||||||
|
|
||||||
for package in "${linux_x64_packages[@]}"; do
|
|
||||||
if [[ "$package" = *'.Intermediate.'* ]]; then
|
|
||||||
continue;
|
|
||||||
fi
|
|
||||||
|
|
||||||
filename=${package##*/}
|
|
||||||
name=${filename%.6.0*}
|
|
||||||
arm_name=${name/linux-x64/linux-arm64}
|
|
||||||
version="6.0${filename##*6.0}"
|
|
||||||
version=${version%.*}
|
|
||||||
|
|
||||||
nappo download --verbose "$arm_name" "$version"
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
tar czf "dotnet-arm64-prebuilts-$date.tar.gz" "dotnet-arm64-prebuilts-$date"
|
|
||||||
@ -1,212 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Usage:
|
|
||||||
# build-dotnet-tarball [--bootstrap] <tag-from-installer>
|
|
||||||
#
|
|
||||||
# Creates a source archive from a tag (or commit) at github.com/dotnet/installer
|
|
||||||
|
|
||||||
# installer is a little strange, we need to clone it, check out the
|
|
||||||
# tag, build it and then create a tarball from the archive directory
|
|
||||||
# it creates. Also, it is likely that the source archive is only
|
|
||||||
# buildable on the OS it was initially created in.
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
IFS=$'\n\t'
|
|
||||||
|
|
||||||
function print_usage {
|
|
||||||
echo "Usage:"
|
|
||||||
echo "$0 [--bootstrap] <tag-from-installer>"
|
|
||||||
echo
|
|
||||||
echo "Creates a source archive from a tag at https://github.com/dotnet/installer"
|
|
||||||
echo ""
|
|
||||||
echo " --bootstrap build a source tarball usable for bootstrapping .NET"
|
|
||||||
}
|
|
||||||
|
|
||||||
function clean_dotnet_cache {
|
|
||||||
rm -rf ~/.aspnet ~/.dotnet/ ~/.nuget/ ~/.local/share/NuGet ~/.templateengine
|
|
||||||
rm -rf /tmp/NuGet /tmp/NuGetScratch /tmp/.NETCore* /tmp/.NETStandard* /tmp/.dotnet /tmp/dotnet.* /tmp/clr-debug-pipe* /tmp/Razor-Server /tmp/CoreFxPipe* /tmp/VBCSCompiler /tmp/.NETFramework*
|
|
||||||
}
|
|
||||||
|
|
||||||
function check_bootstrap_environment {
|
|
||||||
if rpm -qa | grep dotnet ; then
|
|
||||||
echo "error: dotnet is installed. Not a good idea for bootstrapping."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ -d /usr/lib/dotnet ] || [ -d /usr/lib64/dotnet ] || [ -d /usr/share/dotnet ] ; then
|
|
||||||
echo "error: one of /usr/lib/dotnet /usr/lib64/dotnet or /usr/share/dotnet/ exists. Not a good idea for bootstrapping."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if command -v dotnet ; then
|
|
||||||
echo "error: dotnet is in $PATH. Not a good idea for bootstrapping."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function runtime_id {
|
|
||||||
|
|
||||||
source /etc/os-release
|
|
||||||
case "${ID}" in
|
|
||||||
# Remove the RHEL minor version
|
|
||||||
rhel) rid_version=${VERSION_ID%.*} ;;
|
|
||||||
|
|
||||||
*) rid_version=${VERSION_ID} ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "${ID}.${rid_version}-${arch}"
|
|
||||||
}
|
|
||||||
|
|
||||||
build_bootstrap=false
|
|
||||||
|
|
||||||
declare -A archmap
|
|
||||||
archmap=(
|
|
||||||
["aarch64"]="arm64"
|
|
||||||
["amd64"]="x64"
|
|
||||||
["armv8l"]="arm"
|
|
||||||
["i686"]="x86"
|
|
||||||
["i386"]="x86"
|
|
||||||
["x86_64"]="x64"
|
|
||||||
)
|
|
||||||
|
|
||||||
arch=${archmap["$(uname -m)"]}
|
|
||||||
|
|
||||||
|
|
||||||
positional_args=()
|
|
||||||
while [[ "$#" -gt 0 ]]; do
|
|
||||||
arg="${1}"
|
|
||||||
case "${arg}" in
|
|
||||||
--bootstrap)
|
|
||||||
check_bootstrap_environment
|
|
||||||
build_bootstrap=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-h|--help)
|
|
||||||
print_usage
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
positional_args+=("$1")
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
tag=${positional_args[0]:-}
|
|
||||||
if [[ -z ${tag} ]]; then
|
|
||||||
echo "error: missing tag to build"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
dir_name="dotnet-${tag}"
|
|
||||||
unmodified_tarball_name="${dir_name}-original"
|
|
||||||
tarball_name="${dir_name}"
|
|
||||||
tarball_suffix=.tar.gz
|
|
||||||
|
|
||||||
if [[ ${build_bootstrap} == true ]]; then
|
|
||||||
unmodified_tarball_name="${unmodified_tarball_name}-${arch}-bootstrap"
|
|
||||||
tarball_name="${tarball_name}-${arch}-bootstrap"
|
|
||||||
tarball_suffix=.tar.xz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "${tarball_name}${tarball_suffix}" ]; then
|
|
||||||
echo "error: ${tarball_name}${tarball_suffix} already exists"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
|
|
||||||
temp_dir=$(mktemp -d -p "$(pwd)")
|
|
||||||
pushd "${temp_dir}"
|
|
||||||
git clone https://github.com/dotnet/installer --branch "${tag}" --depth 1
|
|
||||||
pushd installer
|
|
||||||
git submodule update --init --recursive
|
|
||||||
clean_dotnet_cache
|
|
||||||
mkdir -p "../${unmodified_tarball_name}"
|
|
||||||
./build.sh /p:ArcadeBuildTarball=true
|
|
||||||
|
|
||||||
mv artifacts/packages/Debug/Shipping/dotnet-sdk-source-6.*.tar.gz \
|
|
||||||
../../"${unmodified_tarball_name}.tar.gz"
|
|
||||||
|
|
||||||
popd
|
|
||||||
popd
|
|
||||||
|
|
||||||
rm -rf "${temp_dir}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "${tarball_name}"
|
|
||||||
mkdir -p "${tarball_name}"
|
|
||||||
pushd "${tarball_name}"
|
|
||||||
tar xf ../"${unmodified_tarball_name}.tar.gz"
|
|
||||||
|
|
||||||
if [[ ${build_bootstrap} == true ]]; then
|
|
||||||
if [[ "$(wc -l < packages/archive/archiveArtifacts.txt)" != 1 ]]; then
|
|
||||||
echo "error: this is not going to work! update $0 to fix this issue."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
pushd packages/archive/
|
|
||||||
curl -O $(cat archiveArtifacts.txt)
|
|
||||||
popd
|
|
||||||
|
|
||||||
mkdir foo
|
|
||||||
pushd foo
|
|
||||||
|
|
||||||
tar xf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
|
|
||||||
sed -i -E 's|<MicrosoftNETHostModelPackageVersion>6.0.0-rtm.21521.1</|<MicrosoftNETHostModelPackageVersion>6.0.0-rtm.21521.4</|' PackageVersions.props
|
|
||||||
sed -i -E 's|<MicrosoftNETHostModelVersion>6.0.0-rtm.21521.1</|<MicrosoftNETHostModelVersion>6.0.0-rtm.21521.4</|' PackageVersions.props
|
|
||||||
cat PackageVersions.props
|
|
||||||
|
|
||||||
tar czf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz *
|
|
||||||
|
|
||||||
popd
|
|
||||||
rm -rf foo
|
|
||||||
|
|
||||||
./prep.sh --bootstrap
|
|
||||||
|
|
||||||
mkdir -p fixup-previously-source-built-artifacts
|
|
||||||
pushd fixup-previously-source-built-artifacts
|
|
||||||
tar xf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
|
|
||||||
find . -iname '*fedora*nupkg' -delete
|
|
||||||
# We must keep the original file names in the archive, even prepending a ./ leads to issues
|
|
||||||
tar -I 'gzip -1' -cf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz *
|
|
||||||
popd
|
|
||||||
rm -rf fixup-previously-source-built-artifacts
|
|
||||||
|
|
||||||
else
|
|
||||||
find . -type f -iname '*.tar.gz' -delete
|
|
||||||
rm -rf .dotnet
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove files with funny licenses and crypto implementations and
|
|
||||||
# other not-very-useful artifacts. We MUST NOT ship any files that
|
|
||||||
# have unapproved licenses and unexpected cryptographic
|
|
||||||
# implementations.
|
|
||||||
#
|
|
||||||
# We use rm -r (no -f) to make sure the operation fails if the files
|
|
||||||
# are not at the expected locations. If the files are not at the
|
|
||||||
# expected location, we need to find the new location of the files and
|
|
||||||
# delete them, or verify that upstream has already removed the files.
|
|
||||||
|
|
||||||
# Binaries for gradle
|
|
||||||
rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
|
|
||||||
|
|
||||||
# Unnecessary crypto implementation: IDEA
|
|
||||||
rm -r src/runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/
|
|
||||||
|
|
||||||
# https://github.com/dotnet/aspnetcore/issues/34785
|
|
||||||
find src/aspnetcore/src -type d -name samples -print0 | xargs -0 rm -r
|
|
||||||
|
|
||||||
# https://github.com/NuGet/Home/issues/11094
|
|
||||||
rm -r src/nuget-client/test/EndToEnd
|
|
||||||
|
|
||||||
# https://github.com/Humanizr/sample-aspnetmvc/issues/1
|
|
||||||
rm -r src/source-build/src/humanizer/samples/
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
if [[ ${build_bootstrap} == true ]]; then
|
|
||||||
tar -I 'xz -T 0' -cf "${tarball_name}${tarball_suffix}" "${tarball_name}"
|
|
||||||
else
|
|
||||||
tar -czf "${tarball_name}${tarball_suffix}" "${tarball_name}"
|
|
||||||
fi
|
|
||||||
@ -1,135 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
|
|
||||||
"""
|
|
||||||
Check debug symbols are present in shared object and can identify
|
|
||||||
code.
|
|
||||||
|
|
||||||
It starts scanning from a directory and recursively scans all ELF
|
|
||||||
files found in it for various symbols to ensure all debuginfo is
|
|
||||||
present and nothing has been stripped.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
./check-debug-symbols /path/of/dir/to/scan/
|
|
||||||
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
./check-debug-symbols /usr/lib64
|
|
||||||
"""
|
|
||||||
|
|
||||||
# This technique was explained to me by Mark Wielaard (mjw).
|
|
||||||
|
|
||||||
import collections
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
|
|
||||||
ScanResult = collections.namedtuple('ScanResult',
|
|
||||||
'file_name debug_info debug_abbrev file_symbols gnu_debuglink')
|
|
||||||
|
|
||||||
|
|
||||||
def scan_file(file):
|
|
||||||
"Scan the provided file and return a ScanResult containing results of the scan."
|
|
||||||
|
|
||||||
# Test for .debug_* sections in the shared object. This is the main test.
|
|
||||||
# Stripped objects will not contain these.
|
|
||||||
readelf_S_result = subprocess.run(['eu-readelf', '-S', file],
|
|
||||||
stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
|
||||||
has_debug_info = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_info' in line)
|
|
||||||
|
|
||||||
has_debug_abbrev = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_abbrev' in line)
|
|
||||||
|
|
||||||
# Test FILE symbols. These will most likely be removed by anyting that
|
|
||||||
# manipulates symbol tables because it's generally useless. So a nice test
|
|
||||||
# that nothing has messed with symbols.
|
|
||||||
def contains_file_symbols(line):
|
|
||||||
parts = line.split()
|
|
||||||
if len(parts) < 8:
|
|
||||||
return False
|
|
||||||
return \
|
|
||||||
parts[2] == '0' and parts[3] == 'FILE' and parts[4] == 'LOCAL' and parts[5] == 'DEFAULT' and \
|
|
||||||
parts[6] == 'ABS' and re.match(r'((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx))?', parts[7])
|
|
||||||
|
|
||||||
readelf_s_result = subprocess.run(["eu-readelf", '-s', file],
|
|
||||||
stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
|
||||||
has_file_symbols = any(line for line in readelf_s_result.stdout.split('\n') if contains_file_symbols(line))
|
|
||||||
|
|
||||||
# Test that there are no .gnu_debuglink sections pointing to another
|
|
||||||
# debuginfo file. There shouldn't be any debuginfo files, so the link makes
|
|
||||||
# no sense either.
|
|
||||||
has_gnu_debuglink = any(line for line in readelf_s_result.stdout.split('\n') if '] .gnu_debuglink' in line)
|
|
||||||
|
|
||||||
return ScanResult(file, has_debug_info, has_debug_abbrev, has_file_symbols, has_gnu_debuglink)
|
|
||||||
|
|
||||||
def is_elf(file):
|
|
||||||
result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
|
||||||
return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout)
|
|
||||||
|
|
||||||
def scan_file_if_sensible(file):
|
|
||||||
if is_elf(file):
|
|
||||||
return scan_file(file)
|
|
||||||
return None
|
|
||||||
|
|
||||||
def scan_dir(dir):
|
|
||||||
results = []
|
|
||||||
for root, _, files in os.walk(dir):
|
|
||||||
for name in files:
|
|
||||||
result = scan_file_if_sensible(os.path.join(root, name))
|
|
||||||
if result:
|
|
||||||
results.append(result)
|
|
||||||
return results
|
|
||||||
|
|
||||||
def scan(file):
|
|
||||||
file = os.path.abspath(file)
|
|
||||||
if os.path.isdir(file):
|
|
||||||
return scan_dir(file)
|
|
||||||
elif os.path.isfile(file):
|
|
||||||
return [scan_file_if_sensible(file)]
|
|
||||||
|
|
||||||
def is_bad_result(result):
|
|
||||||
return not result.debug_info or not result.debug_abbrev or not result.file_symbols or result.gnu_debuglink
|
|
||||||
|
|
||||||
def print_scan_results(results, verbose):
|
|
||||||
# print(results)
|
|
||||||
for result in results:
|
|
||||||
file_name = result.file_name
|
|
||||||
found_issue = False
|
|
||||||
if not result.debug_info:
|
|
||||||
found_issue = True
|
|
||||||
print('error: missing .debug_info section in', file_name)
|
|
||||||
if not result.debug_abbrev:
|
|
||||||
found_issue = True
|
|
||||||
print('error: missing .debug_abbrev section in', file_name)
|
|
||||||
if not result.file_symbols:
|
|
||||||
found_issue = True
|
|
||||||
print('error: missing FILE symbols in', file_name)
|
|
||||||
if result.gnu_debuglink:
|
|
||||||
found_issue = True
|
|
||||||
print('error: unexpected .gnu_debuglink section in', file_name)
|
|
||||||
if verbose and not found_issue:
|
|
||||||
print('OK: ', file_name)
|
|
||||||
|
|
||||||
def main(args):
|
|
||||||
verbose = False
|
|
||||||
files = []
|
|
||||||
for arg in args:
|
|
||||||
if arg == '--verbose' or arg == '-v':
|
|
||||||
verbose = True
|
|
||||||
else:
|
|
||||||
files.append(arg)
|
|
||||||
|
|
||||||
results = []
|
|
||||||
for file in files:
|
|
||||||
results.extend(scan(file))
|
|
||||||
|
|
||||||
print_scan_results(results, verbose)
|
|
||||||
|
|
||||||
if any(is_bad_result(result) for result in results):
|
|
||||||
return 1
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
sys.exit(main(sys.argv[1:]))
|
|
||||||
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
dotnet6.0 was removed due to minimization efforts prior to public launch
|
||||||
14
dotnet.sh.in
14
dotnet.sh.in
@ -1,14 +0,0 @@
|
|||||||
|
|
||||||
# Set location for AppHost lookup
|
|
||||||
[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=@LIBDIR@/dotnet
|
|
||||||
|
|
||||||
# Add dotnet tools directory to PATH
|
|
||||||
DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
|
|
||||||
case "$PATH" in
|
|
||||||
*"$DOTNET_TOOLS_PATH"* ) true ;;
|
|
||||||
* ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Extract self-contained executables under HOME
|
|
||||||
# to avoid multi-user issues from using the default '/var/tmp'.
|
|
||||||
[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract"
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
# Tarball is generated, no upstream URL
|
|
||||||
addFilter("W:.*invalid-url Source0: dotnet-.*tar.gz")
|
|
||||||
|
|
||||||
# macOS is the correct name
|
|
||||||
addFilter("W: spelling-error %description -l en_US macOS ->.*")
|
|
||||||
# The name of the nuget package includes NETCore
|
|
||||||
addFilter("W: spelling-error .* NETCore -> Net Core.*")
|
|
||||||
|
|
||||||
# Upstream really has no README or documentation files. They suggest using online resources.
|
|
||||||
addFilter("W: no-documentation")
|
|
||||||
|
|
||||||
# This is a script that we run; it's expected to have execute permissions
|
|
||||||
addFilter("W: strange-permission check-debug-symbols.py")
|
|
||||||
|
|
||||||
# libicu is a required dependency, but it's used via a dlopen()
|
|
||||||
addFilter("E: explicit-lib-dependency libicu")
|
|
||||||
|
|
||||||
# There's no devel package for us to place .h files
|
|
||||||
addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.h")
|
|
||||||
addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.a")
|
|
||||||
|
|
||||||
# These paths are non-standard, so we need $ORIGIN to find these libraries
|
|
||||||
addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN/netcoredeps'\]")
|
|
||||||
addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN'\]")
|
|
||||||
|
|
||||||
# We put dll files in /usr/lib/dotnet, but rpmlint somehow doesn't see it as a binary?
|
|
||||||
addFilter("W: only-non-binary-in-usr-lib")
|
|
||||||
|
|
||||||
# We use a number of zero-length files, including _._
|
|
||||||
addFilter("E: zero-length /usr/lib64/dotnet/.*/_\._")
|
|
||||||
|
|
||||||
# Upstream uses hidden files, even though we ask them not to, as much as possible
|
|
||||||
addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.version")
|
|
||||||
addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.toolsetversion")
|
|
||||||
|
|
||||||
1033
dotnet6.0.spec
1033
dotnet6.0.spec
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
|||||||
--- a/tests/benchmarks/MicroPerf/MicroPerf.fsproj
|
|
||||||
+++ b/tests/benchmarks/MicroPerf/MicroPerf.fsproj
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
<OtherFlags>$(OtherFlags) --nowarn:57</OtherFlags>
|
|
||||||
<OtherFlags>$(OtherFlags) --langversion:preview</OtherFlags>
|
|
||||||
<OtherFlags>$(OtherFlags) --define:PREVIEW</OtherFlags>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
<!-- By default this project will compile with the proto compiler -->
|
|
||||||
<!-- Uncommenting this will build with a previous installed compiler -->
|
|
||||||
<!--
|
|
||||||
--- a/tests/benchmarks/TaskPerf/TaskPerf.fsproj
|
|
||||||
+++ b/tests/benchmarks/TaskPerf/TaskPerf.fsproj
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
<TargetFramework>net5.0</TargetFramework>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
<!-- Turn off "This function is for use by compiled F# code and should not be used directly" -->
|
|
||||||
<OtherFlags>$(OtherFlags) --nowarn:1204</OtherFlags>
|
|
||||||
<!-- Turn off "Experimental" -->
|
|
||||||
|
|
||||||
20
gating.yaml
20
gating.yaml
@ -1,20 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_testing
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-*
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
--- a/src/Build/Definition/ProjectCollection.cs
|
|
||||||
+++ b/src/Build/Definition/ProjectCollection.cs
|
|
||||||
@@ -1754,7 +1754,11 @@ namespace Microsoft.Build.Evaluation
|
|
||||||
#if FEATURE_WIN32_REGISTRY
|
|
||||||
ToolsetRegistryReader registryReader = null,
|
|
||||||
#endif
|
|
||||||
+#if FEATURE_SYSTEM_CONFIGURATION
|
|
||||||
ToolsetConfigurationReader configReader = null
|
|
||||||
+#else
|
|
||||||
+ object configReader = null
|
|
||||||
+#endif
|
|
||||||
)
|
|
||||||
{
|
|
||||||
_toolsets = new Dictionary<string, Toolset>(StringComparer.OrdinalIgnoreCase);
|
|
||||||
--- a/src/Build/Definition/ToolsetReader.cs
|
|
||||||
+++ b/src/Build/Definition/ToolsetReader.cs
|
|
||||||
@@ -101,7 +101,11 @@ namespace Microsoft.Build.Evaluation
|
|
||||||
#if FEATURE_WIN32_REGISTRY
|
|
||||||
ToolsetRegistryReader registryReader,
|
|
||||||
#endif
|
|
||||||
+#if FEATURE_SYSTEM_CONFIGURATION
|
|
||||||
ToolsetConfigurationReader configurationReader,
|
|
||||||
+#else
|
|
||||||
+ object _configurationReader,
|
|
||||||
+#endif
|
|
||||||
PropertyDictionary<ProjectPropertyInstance> environmentProperties,
|
|
||||||
PropertyDictionary<ProjectPropertyInstance> globalProperties,
|
|
||||||
ToolsetDefinitionLocations locations
|
|
||||||
@@ -120,6 +124,7 @@ namespace Microsoft.Build.Evaluation
|
|
||||||
|
|
||||||
if ((locations & ToolsetDefinitionLocations.ConfigurationFile) == ToolsetDefinitionLocations.ConfigurationFile)
|
|
||||||
{
|
|
||||||
+#if FEATURE_SYSTEM_CONFIGURATION
|
|
||||||
if (configurationReader == null)
|
|
||||||
{
|
|
||||||
configurationReader = new ToolsetConfigurationReader(environmentProperties, globalProperties);
|
|
||||||
@@ -129,6 +134,9 @@ namespace Microsoft.Build.Evaluation
|
|
||||||
defaultToolsVersionFromConfiguration = configurationReader.ReadToolsets(toolsets, globalProperties,
|
|
||||||
initialProperties, true /* accumulate properties */, out overrideTasksPathFromConfiguration,
|
|
||||||
out defaultOverrideToolsVersionFromConfiguration);
|
|
||||||
+#else
|
|
||||||
+ throw new InvalidOperationException("ToolsetDefinitionLocations.ConfigurationFile not supported");
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
string defaultToolsVersionFromRegistry = null;
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- a/src/Shared/ExceptionHandling.cs
|
|
||||||
+++ b/src/Shared/ExceptionHandling.cs
|
|
||||||
@@ -153,7 +153,9 @@ namespace Microsoft.Build.Shared
|
|
||||||
internal static bool IsXmlException(Exception e)
|
|
||||||
{
|
|
||||||
return e is XmlException
|
|
||||||
+#if FEATURE_SECURITY_PERMISSIONS
|
|
||||||
|| e is XmlSyntaxException
|
|
||||||
+#endif
|
|
||||||
|| e is XmlSchemaException
|
|
||||||
|| e is UriFormatException; // XmlTextReader for example uses this under the covers
|
|
||||||
}
|
|
||||||
@ -1,453 +0,0 @@
|
|||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Core/Portable/InternalUtilities/PlatformInformation.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Core/Portable/InternalUtilities/PlatformInformation.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Core/Portable/InternalUtilities/PlatformInformation.cs
|
|
||||||
@@ -31,5 +31,24 @@ namespace Roslyn.Utilities
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ /// <summary>
|
|
||||||
+ /// Are we running on .NET 5 or later using the Mono runtime?
|
|
||||||
+ /// Will also return true when running on Mono itself; if necessary
|
|
||||||
+ /// we can use IsRunningOnMono to distinguish.
|
|
||||||
+ /// </summary>
|
|
||||||
+ public static bool IsUsingMonoRuntime
|
|
||||||
+ {
|
|
||||||
+ get
|
|
||||||
+ {
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ return !(Type.GetType("Mono.RuntimeStructs", throwOnError: false) is null);
|
|
||||||
+ }
|
|
||||||
+ catch
|
|
||||||
+ {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs
|
|
||||||
@@ -79,7 +79,7 @@ namespace Microsoft.CodeAnalysis.Compile
|
|
||||||
// to connect. When it fails it should fall back to in-proc
|
|
||||||
// compilation.
|
|
||||||
bool holdsMutex;
|
|
||||||
- using (var serverMutex = new Mutex(initiallyOwned: true,
|
|
||||||
+ using (var serverMutex = BuildServerConnection.OpenOrCreateMutex(
|
|
||||||
name: BuildServerConnection.GetServerMutexName(_pipeName),
|
|
||||||
createdNew: out holdsMutex))
|
|
||||||
{
|
|
||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs
|
|
||||||
@@ -103,7 +103,7 @@ class Hello
|
|
||||||
var mutexName = BuildServerConnection.GetServerMutexName(pipeName);
|
|
||||||
|
|
||||||
bool holdsMutex;
|
|
||||||
- using (var mutex = new Mutex(initiallyOwned: true,
|
|
||||||
+ using (var mutex = BuildServerConnection.OpenOrCreateMutex(
|
|
||||||
name: mutexName,
|
|
||||||
createdNew: out holdsMutex))
|
|
||||||
{
|
|
||||||
@@ -119,7 +119,7 @@ class Hello
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
- mutex.ReleaseMutex();
|
|
||||||
+ mutex.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
|
|
||||||
@@ -304,7 +304,7 @@ End Module")
|
|
||||||
var newTempDir = _tempDirectory.CreateDirectory(new string('a', 100 - _tempDirectory.Path.Length));
|
|
||||||
await ApplyEnvironmentVariables(
|
|
||||||
new[] { new KeyValuePair<string, string>("TMPDIR", newTempDir.Path) },
|
|
||||||
- async () =>
|
|
||||||
+ async () => await Task.Run(async () =>
|
|
||||||
{
|
|
||||||
using var serverData = await ServerUtil.CreateServer(_logger);
|
|
||||||
var result = RunCommandLineCompiler(
|
|
||||||
@@ -317,7 +317,7 @@ End Module")
|
|
||||||
|
|
||||||
var listener = await serverData.Complete();
|
|
||||||
Assert.Equal(CompletionData.RequestCompleted, listener.CompletionDataList.Single());
|
|
||||||
- });
|
|
||||||
+ }));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs
|
|
||||||
@@ -101,7 +101,7 @@ namespace Microsoft.CodeAnalysis.Compile
|
|
||||||
|
|
||||||
var thread = new Thread(() =>
|
|
||||||
{
|
|
||||||
- using (var mutex = new Mutex(initiallyOwned: true, name: mutexName, createdNew: out created))
|
|
||||||
+ using (var mutex = BuildServerConnection.OpenOrCreateMutex(name: mutexName, createdNew: out created))
|
|
||||||
using (var stream = NamedPipeUtil.CreateServer(pipeName))
|
|
||||||
{
|
|
||||||
readyMre.Set();
|
|
||||||
@@ -112,7 +112,7 @@ namespace Microsoft.CodeAnalysis.Compile
|
|
||||||
stream.Close();
|
|
||||||
|
|
||||||
doneMre.WaitOne();
|
|
||||||
- mutex.ReleaseMutex();
|
|
||||||
+ mutex.Dispose();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
@@ -153,7 +153,7 @@ namespace Microsoft.CodeAnalysis.Compile
|
|
||||||
{
|
|
||||||
using (var stream = NamedPipeUtil.CreateServer(pipeName))
|
|
||||||
{
|
|
||||||
- var mutex = new Mutex(initiallyOwned: true, name: mutexName, createdNew: out created);
|
|
||||||
+ var mutex = BuildServerConnection.OpenOrCreateMutex(name: mutexName, createdNew: out created);
|
|
||||||
readyMre.Set();
|
|
||||||
|
|
||||||
stream.WaitForConnection();
|
|
||||||
@@ -161,7 +161,6 @@ namespace Microsoft.CodeAnalysis.Compile
|
|
||||||
|
|
||||||
// Client is waiting for a response. Close the mutex now. Then close the connection
|
|
||||||
// so the client gets an error.
|
|
||||||
- mutex.ReleaseMutex();
|
|
||||||
mutex.Dispose();
|
|
||||||
stream.Close();
|
|
||||||
|
|
||||||
Index: tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Shared/BuildServerConnection.cs
|
|
||||||
===================================================================
|
|
||||||
--- tarball.6.0.1-rc2-6.0.100-rc2.orig/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Shared/BuildServerConnection.cs
|
|
||||||
+++ tarball.6.0.1-rc2-6.0.100-rc2/src/roslyn.8e1779e16298415843e85029d8b52a1ae9bb4c30/src/Compilers/Shared/BuildServerConnection.cs
|
|
||||||
@@ -543,19 +543,10 @@ namespace Microsoft.CodeAnalysis.Command
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- if (PlatformInformation.IsRunningOnMono)
|
|
||||||
+ if (PlatformInformation.IsUsingMonoRuntime)
|
|
||||||
{
|
|
||||||
- IServerMutex? mutex = null;
|
|
||||||
- bool createdNew = false;
|
|
||||||
- try
|
|
||||||
- {
|
|
||||||
- mutex = new ServerFileMutexPair(mutexName, false, out createdNew);
|
|
||||||
- return !createdNew;
|
|
||||||
- }
|
|
||||||
- finally
|
|
||||||
- {
|
|
||||||
- mutex?.Dispose();
|
|
||||||
- }
|
|
||||||
+ using var mutex = new ServerFileMutex(mutexName);
|
|
||||||
+ return !mutex.CouldLock();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@@ -572,9 +563,11 @@ namespace Microsoft.CodeAnalysis.Command
|
|
||||||
|
|
||||||
internal static IServerMutex OpenOrCreateMutex(string name, out bool createdNew)
|
|
||||||
{
|
|
||||||
- if (PlatformInformation.IsRunningOnMono)
|
|
||||||
+ if (PlatformInformation.IsUsingMonoRuntime)
|
|
||||||
{
|
|
||||||
- return new ServerFileMutexPair(name, initiallyOwned: true, out createdNew);
|
|
||||||
+ var mutex = new ServerFileMutex(name);
|
|
||||||
+ createdNew = mutex.TryLock(0);
|
|
||||||
+ return mutex;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@@ -648,19 +641,22 @@ namespace Microsoft.CodeAnalysis.Command
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
- /// An interprocess mutex abstraction based on OS advisory locking (FileStream.Lock/Unlock).
|
|
||||||
+ /// An interprocess mutex abstraction based on file sharing permission (FileShare.None).
|
|
||||||
/// If multiple processes running as the same user create FileMutex instances with the same name,
|
|
||||||
/// those instances will all point to the same file somewhere in a selected temporary directory.
|
|
||||||
- /// The TryLock method can be used to attempt to acquire the mutex, with Unlock or Dispose used to release.
|
|
||||||
+ /// The TryLock method can be used to attempt to acquire the mutex, with Dispose used to release.
|
|
||||||
+ /// The CouldLock method can be used to check whether an attempt to acquire the mutex would have
|
|
||||||
+ /// succeeded at the current time, without actually acquiring it.
|
|
||||||
/// Unlike Win32 named mutexes, there is no mechanism for detecting an abandoned mutex. The file
|
|
||||||
/// will simply revert to being unlocked but remain where it is.
|
|
||||||
/// </summary>
|
|
||||||
- internal sealed class FileMutex : IDisposable
|
|
||||||
+ internal sealed class ServerFileMutex : IServerMutex
|
|
||||||
{
|
|
||||||
- public readonly FileStream Stream;
|
|
||||||
+ public FileStream? Stream;
|
|
||||||
public readonly string FilePath;
|
|
||||||
+ public readonly string GuardPath;
|
|
||||||
|
|
||||||
- public bool IsLocked { get; private set; }
|
|
||||||
+ public bool IsDisposed { get; private set; }
|
|
||||||
|
|
||||||
internal static string GetMutexDirectory()
|
|
||||||
{
|
|
||||||
@@ -670,61 +666,176 @@ namespace Microsoft.CodeAnalysis.Command
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
- public FileMutex(string name)
|
|
||||||
+ public ServerFileMutex(string name)
|
|
||||||
{
|
|
||||||
- FilePath = Path.Combine(GetMutexDirectory(), name);
|
|
||||||
- Stream = new FileStream(FilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
|
|
||||||
+ var mutexDirectory = GetMutexDirectory();
|
|
||||||
+ FilePath = Path.Combine(mutexDirectory, name);
|
|
||||||
+ GuardPath = Path.Combine(mutexDirectory, ".guard");
|
|
||||||
}
|
|
||||||
|
|
||||||
- public bool TryLock(int timeoutMs)
|
|
||||||
+ /// <summary>
|
|
||||||
+ /// Acquire the guard by opening the guard file with FileShare.None. The guard must only ever
|
|
||||||
+ /// be held for very brief amounts of time, so we can simply spin until it is acquired. The
|
|
||||||
+ /// guard must be released by disposing the FileStream returned from this routine. Note the
|
|
||||||
+ /// guard file is never deleted; this is a leak, but only of a single file.
|
|
||||||
+ /// </summary>
|
|
||||||
+ internal FileStream LockGuard()
|
|
||||||
{
|
|
||||||
- if (IsLocked)
|
|
||||||
- throw new InvalidOperationException("Lock already held");
|
|
||||||
-
|
|
||||||
- var sw = Stopwatch.StartNew();
|
|
||||||
- do
|
|
||||||
+ // We should be able to acquire the guard quickly. Limit the number of retries anyway
|
|
||||||
+ // by some arbitrary bound to avoid getting hung up in a possibly infinite loop.
|
|
||||||
+ for (var i = 0; i < 100; i++)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- Stream.Lock(0, 0);
|
|
||||||
- IsLocked = true;
|
|
||||||
- return true;
|
|
||||||
+ return new FileStream(GuardPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
|
|
||||||
}
|
|
||||||
catch (IOException)
|
|
||||||
{
|
|
||||||
- // Lock currently held by someone else.
|
|
||||||
+ // Guard currently held by someone else.
|
|
||||||
// We want to sleep for a short period of time to ensure that other processes
|
|
||||||
// have an opportunity to finish their work and relinquish the lock.
|
|
||||||
// Spinning here (via Yield) would work but risks creating a priority
|
|
||||||
// inversion if the lock is held by a lower-priority process.
|
|
||||||
Thread.Sleep(1);
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
+ // Handle unexpected failure to acquire guard as error.
|
|
||||||
+ throw new InvalidOperationException("Unable to acquire guard");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /// <summary>
|
|
||||||
+ /// Attempt to acquire the lock by opening the lock file with FileShare.None. Sets "Stream"
|
|
||||||
+ /// and returns true if successful, returns false if the lock is already held by another
|
|
||||||
+ /// thread or process. Guard must be held when calling this routine.
|
|
||||||
+ /// </summary>
|
|
||||||
+ internal bool TryLockFile()
|
|
||||||
+ {
|
|
||||||
+ Debug.Assert(Stream is null);
|
|
||||||
+ FileStream? stream = null;
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ stream = new FileStream(FilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
|
|
||||||
+ // On some targets, the file locking used to implement FileShare.None may not be
|
|
||||||
+ // atomic with opening/creating the file. This creates a race window when another
|
|
||||||
+ // thread holds the lock and is just about to unlock: we may be able to open the
|
|
||||||
+ // file here, then the other thread unlocks and deletes the file, and then we
|
|
||||||
+ // acquire the lock on our file handle - but the actual file is already deleted.
|
|
||||||
+ // To close this race, we verify that the file does in fact still exist now that
|
|
||||||
+ // we have successfull acquired the locked FileStream. (Note that this check is
|
|
||||||
+ // safe because we cannot race with an other attempt to create the file since we
|
|
||||||
+ // hold the guard, and after the FileStream constructor returned we can no race
|
|
||||||
+ // with file deletion because we hold the lock.)
|
|
||||||
+ if (!File.Exists(FilePath))
|
|
||||||
+ {
|
|
||||||
+ // To simplify the logic, we treat this case as "unable to acquire the lock"
|
|
||||||
+ // because it we caught another process while it owned the lock and was just
|
|
||||||
+ // giving it up. If the caller retries, we'll likely acquire the lock then.
|
|
||||||
+ stream.Dispose();
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ catch (Exception)
|
|
||||||
+ {
|
|
||||||
+ stream?.Dispose();
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ Stream = stream;
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /// <summary>
|
|
||||||
+ /// Release the lock by deleting the lock file and disposing "Stream".
|
|
||||||
+ /// </summary>
|
|
||||||
+ internal void UnlockFile()
|
|
||||||
+ {
|
|
||||||
+ Debug.Assert(Stream is not null);
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ // Delete the lock file while the stream is not yet disposed
|
|
||||||
+ // and we therefore still hold the FileShare.None exclusion.
|
|
||||||
+ // There may still be a race with another thread attempting a
|
|
||||||
+ // TryLockFile in parallel, but that is safely handled there.
|
|
||||||
+ File.Delete(FilePath);
|
|
||||||
+ }
|
|
||||||
+ finally
|
|
||||||
+ {
|
|
||||||
+ Stream.Dispose();
|
|
||||||
+ Stream = null;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public bool TryLock(int timeoutMs)
|
|
||||||
+ {
|
|
||||||
+ if (IsDisposed)
|
|
||||||
+ throw new ObjectDisposedException("Mutex");
|
|
||||||
+ if (Stream is not null)
|
|
||||||
+ throw new InvalidOperationException("Lock already held");
|
|
||||||
+
|
|
||||||
+ var sw = Stopwatch.StartNew();
|
|
||||||
+ do
|
|
||||||
+ {
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ // Attempt to acquire lock while holding guard.
|
|
||||||
+ using var guard = LockGuard();
|
|
||||||
+ if (TryLockFile())
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
- // Something else went wrong.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // See comment in LockGuard.
|
|
||||||
+ Thread.Sleep(1);
|
|
||||||
} while (sw.ElapsedMilliseconds < timeoutMs);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
- public void Unlock()
|
|
||||||
+ public bool CouldLock()
|
|
||||||
{
|
|
||||||
- if (!IsLocked)
|
|
||||||
- return;
|
|
||||||
- Stream.Unlock(0, 0);
|
|
||||||
- IsLocked = false;
|
|
||||||
+ if (IsDisposed)
|
|
||||||
+ return false;
|
|
||||||
+ if (Stream is not null)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ // Attempt to acquire lock while holding guard, and if successful
|
|
||||||
+ // immediately unlock again while still holding guard. This ensures
|
|
||||||
+ // no other thread will spuriously observe the lock as held due to
|
|
||||||
+ // the lock attempt here.
|
|
||||||
+ using var guard = LockGuard();
|
|
||||||
+ if (TryLockFile())
|
|
||||||
+ {
|
|
||||||
+ UnlockFile();
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ catch (Exception)
|
|
||||||
+ {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
- var wasLocked = IsLocked;
|
|
||||||
- if (wasLocked)
|
|
||||||
- Unlock();
|
|
||||||
- Stream.Dispose();
|
|
||||||
- // We do not delete the lock file here because there is no reliable way to perform a
|
|
||||||
- // 'delete if no one has the file open' operation atomically on *nix. This is a leak.
|
|
||||||
+ if (IsDisposed)
|
|
||||||
+ return;
|
|
||||||
+ IsDisposed = true;
|
|
||||||
+ if (Stream is not null)
|
|
||||||
+ {
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ UnlockFile();
|
|
||||||
+ }
|
|
||||||
+ catch (Exception)
|
|
||||||
+ {
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -792,56 +903,4 @@ namespace Microsoft.CodeAnalysis.Command
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- /// <summary>
|
|
||||||
- /// Approximates a named mutex with 'locked', 'unlocked' and 'abandoned' states.
|
|
||||||
- /// There is no reliable way to detect whether a mutex has been abandoned on some target platforms,
|
|
||||||
- /// so we use the AliveMutex to manually track whether the creator of a mutex is still running,
|
|
||||||
- /// while the HeldMutex represents the actual lock state of the mutex.
|
|
||||||
- /// </summary>
|
|
||||||
- internal sealed class ServerFileMutexPair : IServerMutex
|
|
||||||
- {
|
|
||||||
- public readonly FileMutex AliveMutex;
|
|
||||||
- public readonly FileMutex HeldMutex;
|
|
||||||
-
|
|
||||||
- public bool IsDisposed { get; private set; }
|
|
||||||
-
|
|
||||||
- public ServerFileMutexPair(string mutexName, bool initiallyOwned, out bool createdNew)
|
|
||||||
- {
|
|
||||||
- AliveMutex = new FileMutex(mutexName + "-alive");
|
|
||||||
- HeldMutex = new FileMutex(mutexName + "-held");
|
|
||||||
- createdNew = AliveMutex.TryLock(0);
|
|
||||||
- if (initiallyOwned && createdNew)
|
|
||||||
- {
|
|
||||||
- if (!TryLock(0))
|
|
||||||
- throw new Exception("Failed to lock mutex after creating it");
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- public bool TryLock(int timeoutMs)
|
|
||||||
- {
|
|
||||||
- if (IsDisposed)
|
|
||||||
- throw new ObjectDisposedException("Mutex");
|
|
||||||
- return HeldMutex.TryLock(timeoutMs);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- public void Dispose()
|
|
||||||
- {
|
|
||||||
- if (IsDisposed)
|
|
||||||
- return;
|
|
||||||
- IsDisposed = true;
|
|
||||||
-
|
|
||||||
- try
|
|
||||||
- {
|
|
||||||
- HeldMutex.Unlock();
|
|
||||||
- AliveMutex.Unlock();
|
|
||||||
- }
|
|
||||||
- finally
|
|
||||||
- {
|
|
||||||
- AliveMutex.Dispose();
|
|
||||||
- HeldMutex.Dispose();
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
|
|
||||||
+++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
|
||||||
<NonShipping>true</NonShipping>
|
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- a/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj
|
|
||||||
+++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj
|
|
||||||
@@ -5,6 +5,7 @@
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
|
||||||
<!-- The purpose of this project is to include all dependecies of Microsoft.CodeAnalysis.Remote.ServiceHub targeting .Net Core -->
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
<IsShipping>false</IsShipping>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
inspections:
|
|
||||||
# We ship an empty dotnet package that installs the latest SDK, but
|
|
||||||
# also a newer SDK when we have that
|
|
||||||
emptyrpm: off
|
|
||||||
# We patch upstream a lot, no need to reject patches
|
|
||||||
patches: off
|
|
||||||
badfuncs:
|
|
||||||
ignore:
|
|
||||||
# TODO This removes all badfuncs checks on libcoreclr! Use
|
|
||||||
# https://github.com/rpminspect/rpminspect/issues/573 to filter
|
|
||||||
# out the specific issues when that's available
|
|
||||||
|
|
||||||
# inet_addr: mono/s390x uses inet_addr for some internal
|
|
||||||
# debugging. See runtime/src/mono/mono/mini/cfgdump.c
|
|
||||||
- /usr/lib*/dotnet/shared/Microsoft.NETCore.App/6.0.*/libcoreclr.so
|
|
||||||
runpath:
|
|
||||||
# Upstream explicitly sets $ORIGIN/netcoredeps as an RPATH
|
|
||||||
# See https://github.com/dotnet/core/blob/main/Documentation/self-contained-linux-apps.md
|
|
||||||
allowed_origin_paths:
|
|
||||||
- /netcoredeps
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff --git a/eng/native/init-compiler.sh b/eng/native/init-compiler.sh
|
|
||||||
index 567d18da474..927b3071e92 100755
|
|
||||||
--- a/eng/native/init-compiler.sh
|
|
||||||
+++ b/eng/native/init-compiler.sh
|
|
||||||
@@ -108,11 +108,8 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$compiler" == "clang" ]]; then
|
|
||||||
- if command -v "lld$desired_version" > /dev/null; then
|
|
||||||
- # Only lld version >= 9 can be considered stable
|
|
||||||
- if [[ "$majorVersion" -ge 9 ]]; then
|
|
||||||
- LDFLAGS="-fuse-ld=lld"
|
|
||||||
- fi
|
|
||||||
+ if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
|
|
||||||
+ LDFLAGS="-fuse-ld=lld"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@ -1,98 +0,0 @@
|
|||||||
From 8bafc61a5e0b172e030b3c354ee7a9dc1d113a3a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Omair Majid <omajid@redhat.com>
|
|
||||||
Date: Wed, 9 Aug 2023 16:43:30 -0400
|
|
||||||
Subject: [PATCH] Add Fedora 40 RID
|
|
||||||
|
|
||||||
---
|
|
||||||
.../src/runtime.compatibility.json | 32 +++++++++++++++++++
|
|
||||||
.../src/runtime.json | 17 ++++++++++
|
|
||||||
.../src/runtimeGroups.props | 2 +-
|
|
||||||
3 files changed, 50 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
||||||
index bf9dcefffef..79e07f75eed 100644
|
|
||||||
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
||||||
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
||||||
@@ -4432,6 +4432,38 @@
|
|
||||||
"any",
|
|
||||||
"base"
|
|
||||||
],
|
|
||||||
+ "fedora.40": [
|
|
||||||
+ "fedora.40",
|
|
||||||
+ "fedora",
|
|
||||||
+ "linux",
|
|
||||||
+ "unix",
|
|
||||||
+ "any",
|
|
||||||
+ "base"
|
|
||||||
+ ],
|
|
||||||
+ "fedora.40-arm64": [
|
|
||||||
+ "fedora.40-arm64",
|
|
||||||
+ "fedora.40",
|
|
||||||
+ "fedora-arm64",
|
|
||||||
+ "fedora",
|
|
||||||
+ "linux-arm64",
|
|
||||||
+ "linux",
|
|
||||||
+ "unix-arm64",
|
|
||||||
+ "unix",
|
|
||||||
+ "any",
|
|
||||||
+ "base"
|
|
||||||
+ ],
|
|
||||||
+ "fedora.40-x64": [
|
|
||||||
+ "fedora.40-x64",
|
|
||||||
+ "fedora.40",
|
|
||||||
+ "fedora-x64",
|
|
||||||
+ "fedora",
|
|
||||||
+ "linux-x64",
|
|
||||||
+ "linux",
|
|
||||||
+ "unix-x64",
|
|
||||||
+ "unix",
|
|
||||||
+ "any",
|
|
||||||
+ "base"
|
|
||||||
+ ],
|
|
||||||
"freebsd": [
|
|
||||||
"freebsd",
|
|
||||||
"unix",
|
|
||||||
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
||||||
index 4bc419bbfde..8fbe76a76b4 100644
|
|
||||||
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
||||||
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
||||||
@@ -1498,6 +1498,23 @@
|
|
||||||
"fedora-x64"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
+ "fedora.40": {
|
|
||||||
+ "#import": [
|
|
||||||
+ "fedora"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
+ "fedora.40-arm64": {
|
|
||||||
+ "#import": [
|
|
||||||
+ "fedora.40",
|
|
||||||
+ "fedora-arm64"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
+ "fedora.40-x64": {
|
|
||||||
+ "#import": [
|
|
||||||
+ "fedora.40",
|
|
||||||
+ "fedora-x64"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
"freebsd": {
|
|
||||||
"#import": [
|
|
||||||
"unix"
|
|
||||||
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
||||||
index 5fe956f0be5..e596bf65aae 100644
|
|
||||||
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
||||||
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
||||||
@@ -71,7 +71,7 @@
|
|
||||||
<RuntimeGroup Include="fedora">
|
|
||||||
<Parent>linux</Parent>
|
|
||||||
<Architectures>x64;arm64</Architectures>
|
|
||||||
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39</Versions>
|
|
||||||
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39;40</Versions>
|
|
||||||
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
|
|
||||||
</RuntimeGroup>
|
|
||||||
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
|
|
||||||
index 724b704f864..3dabdc81dae 100644
|
|
||||||
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
|
|
||||||
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
- <ProjectReference Include="$(RepoTasksDir)ILStripTask\ILStrip.csproj" />
|
|
||||||
+ <ProjectReference Include="$(RepoTasksDir)ILStripTask\ILStrip.csproj" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
|
||||||
<ProjectReference Include="$(RepoTasksDir)RuntimeConfigParser\RuntimeConfigParser.csproj" />
|
|
||||||
<ProjectReference Include="$(RepoTasksDir)JsonToItemsTaskFactory\JsonToItemsTaskFactory.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
<PackageFile Include="Sdk\Sdk.props" TargetPath="Sdk" />
|
|
||||||
<PackageFile Include="Sdk\Sdk.targets" TargetPath="Sdk" />
|
|
||||||
<PackageFile Include="build\$(MSBuildProjectName).props" TargetPath="build" />
|
|
||||||
- <PackageFile Include="Sdk\ILStripTask.props" TargetPath="Sdk" />
|
|
||||||
+ <PackageFile Include="Sdk\ILStripTask.props" TargetPath="Sdk" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
|
||||||
<PackageFile Include="Sdk\RuntimeConfigParserTask.props" TargetPath="Sdk" />
|
|
||||||
<PackageFile Include="Sdk\RuntimeComponentManifest.props" TargetPath="Sdk" />
|
|
||||||
<PackageFile Include="Sdk\RuntimeComponentManifest.targets" TargetPath="Sdk" />
|
|
||||||
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/Sdk.props b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/Sdk.props
|
|
||||||
index 8a7ede79242..cfd515eeca9 100644
|
|
||||||
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/Sdk.props
|
|
||||||
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/Sdk.props
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
<Project>
|
|
||||||
- <Import Project="$(MSBuildThisFileDirectory)\ILStripTask.props" />
|
|
||||||
+ <Import Project="$(MSBuildThisFileDirectory)\ILStripTask.props" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
|
||||||
<Import Project="$(MSBuildThisFileDirectory)\RuntimeConfigParserTask.props" />
|
|
||||||
<Import Project="$(MSBuildThisFileDirectory)\RuntimeComponentManifest.props" />
|
|
||||||
</Project>
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
|
|
||||||
index de1ebb9e6..6bbf479de 100644
|
|
||||||
--- a/src/Cli/dotnet/Program.cs
|
|
||||||
+++ b/src/Cli/dotnet/Program.cs
|
|
||||||
@@ -28,6 +28,13 @@ public class Program
|
|
||||||
|
|
||||||
public static int Main(string[] args)
|
|
||||||
{
|
|
||||||
+ // opt out of telemetry by default if the env var is unset
|
|
||||||
+ string telemetryValue = Environment.GetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT");
|
|
||||||
+ if (String.IsNullOrEmpty(telemetryValue))
|
|
||||||
+ {
|
|
||||||
+ Environment.SetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
DebugHelper.HandleDebugSwitch(ref args);
|
|
||||||
|
|
||||||
// Capture the current timestamp to calculate the host overhead.
|
|
||||||
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (dotnet-v6.0.126.tar.gz) = 1bdbf63069f62ab4b243be45b00724f79af99b4e97719ec45d0a5797bdaacebd40d311af34f22d3cf047de93087ca9b888d8fc57b84833ee4d9b92716ee34d29
|
|
||||||
@ -1 +0,0 @@
|
|||||||
2
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
|
|
||||||
standard-inventory-qcow2:
|
|
||||||
qemu:
|
|
||||||
m: 5G
|
|
||||||
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
---
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
- container
|
|
||||||
- atomic
|
|
||||||
repositories:
|
|
||||||
- repo: "https://github.com/redhat-developer/dotnet-regular-tests.git"
|
|
||||||
dest: "dotnet-regular-tests"
|
|
||||||
version: "main"
|
|
||||||
tests:
|
|
||||||
- download_test_runner:
|
|
||||||
dir: ./
|
|
||||||
run: wget --no-verbose https://github.com/redhat-developer/dotnet-bunny/releases/latest/download/turkey.tar.gz && tar xf turkey.tar.gz
|
|
||||||
- print_test_runner_version:
|
|
||||||
dir: ./
|
|
||||||
run: dotnet turkey/Turkey.dll --version
|
|
||||||
- regular:
|
|
||||||
dir: ./
|
|
||||||
run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests --timeout=1500
|
|
||||||
required_packages:
|
|
||||||
- aspnetcore-runtime-6.0
|
|
||||||
- babeltrace
|
|
||||||
- bash-completion
|
|
||||||
- bc
|
|
||||||
- binutils
|
|
||||||
- dotnet-runtime-6.0
|
|
||||||
- dotnet-sdk-6.0
|
|
||||||
- expect
|
|
||||||
- file
|
|
||||||
- findutils
|
|
||||||
- gcc-c++
|
|
||||||
- git
|
|
||||||
- jq
|
|
||||||
- lldb
|
|
||||||
- lttng-tools
|
|
||||||
- npm
|
|
||||||
- postgresql-odbc
|
|
||||||
- postgresql-server
|
|
||||||
- procps-ng
|
|
||||||
- python3
|
|
||||||
- strace
|
|
||||||
- util-linux
|
|
||||||
- wget
|
|
||||||
- which
|
|
||||||
139
update-release
139
update-release
@ -1,139 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Usage:
|
|
||||||
# ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
IFS=$'\n\t'
|
|
||||||
|
|
||||||
print_usage() {
|
|
||||||
echo " Usage:"
|
|
||||||
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]"
|
|
||||||
}
|
|
||||||
|
|
||||||
user_provided_tarball_name=""
|
|
||||||
|
|
||||||
rpm_release=1
|
|
||||||
positional_args=()
|
|
||||||
bug_ids=()
|
|
||||||
while [[ "$#" -gt 0 ]]; do
|
|
||||||
arg="$1"
|
|
||||||
case "${arg}" in
|
|
||||||
--bug)
|
|
||||||
bug_ids+=("$2")
|
|
||||||
shift;
|
|
||||||
shift;
|
|
||||||
;;
|
|
||||||
-h|--help)
|
|
||||||
print_usage
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
--release-json)
|
|
||||||
release_json="$2"
|
|
||||||
shift;
|
|
||||||
shift;
|
|
||||||
;;
|
|
||||||
--tarball)
|
|
||||||
user_provided_tarball_name="$2"
|
|
||||||
shift;
|
|
||||||
shift;
|
|
||||||
;;
|
|
||||||
--larger-rpm-release)
|
|
||||||
rpm_release="2"
|
|
||||||
shift;
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
positional_args+=("$1")
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
spec_files=( ./*.spec )
|
|
||||||
spec_file="${spec_files[0]}"
|
|
||||||
|
|
||||||
sdk_version=${positional_args[0]:-}
|
|
||||||
if [[ -z ${sdk_version} ]]; then
|
|
||||||
echo "error: missing sdk version"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
runtime_version=${positional_args[1]:-}
|
|
||||||
if [[ -z ${runtime_version} ]]; then
|
|
||||||
echo "error: missing runtime version"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
host_version="$runtime_version"
|
|
||||||
|
|
||||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
|
||||||
tag=v${sdk_version}
|
|
||||||
else
|
|
||||||
tag=v${runtime_version}
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global host_version ${host_version}|" "$spec_file"
|
|
||||||
sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file"
|
|
||||||
sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file"
|
|
||||||
|
|
||||||
|
|
||||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
|
||||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
|
||||||
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
|
|
||||||
else
|
|
||||||
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
|
|
||||||
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
|
|
||||||
else
|
|
||||||
if [[ -n "${user_provided_tarball_name}" ]]; then
|
|
||||||
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
|
||||||
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
|
|
||||||
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
|
||||||
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
|
|
||||||
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
|
||||||
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
|
|
||||||
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
./build-dotnet-tarball "${tag}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
|
||||||
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
|
|
||||||
elif [[ -n ${user_provided_tarball_name} ]]; then
|
|
||||||
cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz"
|
|
||||||
cp -a "${release_json}" release.json
|
|
||||||
else
|
|
||||||
rm -f release.json
|
|
||||||
spectool -g "$spec_file"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
|
|
||||||
commit_message="$comment
|
|
||||||
"
|
|
||||||
for bug_id in "${bug_ids[@]}"; do
|
|
||||||
if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then
|
|
||||||
comment="$comment
|
|
||||||
- Resolves: RHBZ#$bug_id"
|
|
||||||
commit_message="$commit_message
|
|
||||||
Resolves: RHBZ#$bug_id"
|
|
||||||
else
|
|
||||||
comment="$comment
|
|
||||||
- Resolves: $bug_id"
|
|
||||||
commit_message="$commit_message
|
|
||||||
Resolves: $bug_id"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "$commit_message" > git-commit-message
|
|
||||||
|
|
||||||
rpmdev-bumpspec --comment="$comment" "$spec_file"
|
|
||||||
|
|
||||||
# Reset release in 'Release' tag
|
|
||||||
sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' "$spec_file"
|
|
||||||
# Reset Release in changelog comment
|
|
||||||
# See https://stackoverflow.com/questions/18620153/find-matching-text-and-replace-next-line
|
|
||||||
sed -i -E '/^%changelog$/!b;n;s/-[[:digit:]]+$/-'"$rpm_release"'/' "$spec_file"
|
|
||||||
Loading…
Reference in New Issue
Block a user