diff --git a/.dotnet3.0.metadata b/.dotnet3.0.metadata
index c3610da..98fb128 100644
--- a/.dotnet3.0.metadata
+++ b/.dotnet3.0.metadata
@@ -1 +1 @@
-54cff2893b47da7695670a255e106d4c66d79cd0 SOURCES/dotnet-v3.0.0.tar.gz
+34ac63596d42a5fdb1a9391ba617ce6d23e991be SOURCES/dotnet-v3.0.102-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 975c99e..08760aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.0.0.tar.gz
+SOURCES/dotnet-v3.0.102-SDK.tar.gz
diff --git a/SOURCES/core-setup-fix-restore-sources.patch b/SOURCES/core-setup-fix-restore-sources.patch
new file mode 100644
index 0000000..cd3170d
--- /dev/null
+++ b/SOURCES/core-setup-fix-restore-sources.patch
@@ -0,0 +1,13 @@
+Prevent prebuilts from ending up in the sharedframework
+
+--- a/src/pkg/packaging-tools/framework.sharedfx.props
++++ b/src/pkg/packaging-tools/framework.sharedfx.props
+@@ -26,8 +26,6 @@
+ <RestoreAllBuildRids>false</RestoreAllBuildRids>
+ <!-- Ensure only this repo's NuGet.config file is used. -->
+ <RestoreConfigFile>$(ProjectDir)NuGet.config</RestoreConfigFile>
+- <!-- Use repo-restored packages for platforms and targets dependencies -->
+- <RestoreFallbackFolders>$(PackagesDir)</RestoreFallbackFolders>
+ <!-- Don't error due to lack of runtime-specific deps, we're referencing those directly -->
+ <EnsureRuntimePackageDependencies>false</EnsureRuntimePackageDependencies>
+ <!-- Use a project-local packages folder. 'p', not 'packages': max path breathing room. -->
diff --git a/SPECS/dotnet3.0.spec b/SPECS/dotnet3.0.spec
index 9979375..6d1b6d0 100644
--- a/SPECS/dotnet3.0.spec
+++ b/SPECS/dotnet3.0.spec
@@ -23,10 +23,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
-%global host_version 3.0.0
-%global runtime_version 3.0.0
+%global host_version 3.0.2
+%global runtime_version 3.0.2
%global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.0.100
+%global sdk_version 3.0.102
%global templates_version %{runtime_version}
%global host_rpm_version %{host_version}
@@ -52,20 +52,21 @@
Name: dotnet3.0
Version: %{sdk_rpm_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
# The source is generated on a Fedora box via:
# ./build-dotnet-tarball dotnet-v%%{runtime_version}
-Source0: dotnet-v%{runtime_version}.tar.gz
+Source0: dotnet-v%{sdk_version}-SDK.tar.gz
Source1: check-debug-symbols.py
Source2: dotnet.sh
Patch100: corefx-optflags-support.patch
Patch300: core-setup-do-not-strip.patch
+Patch301: core-setup-fix-restore-sources.patch
Patch500: cli-telemetry-optout.patch
@@ -282,10 +283,10 @@ applications using the .NET Core SDK.
%prep
-%setup -q -n dotnet-v%{runtime_version}
+%setup -q -n dotnet-v%{sdk_version}-SDK
# Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
# Disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
@@ -297,11 +298,12 @@ popd
pushd src/coreclr.*
popd
-pushd src/core-setup.*
+pushd src/dotnet-core-setup.*
%patch300 -p1
+%patch301 -p1
popd
-pushd src/cli.*
+pushd src/dotnet-cli.*
%patch500 -p1
popd
@@ -342,12 +344,30 @@ tar xf bin/x64/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{build
tar xf bin/x64/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
-C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
-# Fix executable permissions on files
+# Fix permissions on files
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.dll' -exec chmod -x {} \;
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pdb' -exec chmod -x {} \;
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \;
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \;
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \;
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/PackageOverrides.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/FrameworkList.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/PlatformManifest.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/ref/netcoreapp3.0/*.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/PackageOverrides.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/FrameworkList.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/PlatformManifest.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/Microsoft.AspNetCore.App.Ref/3.0.1/Debug/netstandard2.0/Microsoft.AspNetCore.App.Ref.assets.cache
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.cache
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.dgspec.json
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/project.assets.json
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml
+chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost
+chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost
+chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h
+
# Add ~/.dotnet/tools to $PATH for all users
install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
@@ -355,7 +375,7 @@ install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
# dynamic completion needs the file to be named the same as the base command
-install src/cli.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
# TODO: the zsh completion script needs to be ported to use #compdef
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
@@ -424,6 +444,15 @@ echo "Testing build results for debug symbols..."
%dir %{_libdir}/dotnet/packs
%changelog
+* Wed Jan 15 2020 Omair Majid <omajid@redhat.com> - 3.0.102-2
+- Fix prebuilts leaking into the final build
+- Fix regressions in binary hardering
+- Resolves: RHBZ#1788171
+
+* Fri Jan 10 2020 Omair Majid <omajid@redhat.com> - 3.0.102-1
+- Update to .NET Core Runtime 3.0.2 and SDK 3.0.102
+- Resolves: RHBZ#1788171
+
* Fri Sep 27 2019 Omair Majid <omajid@redhat.com> - 3.0.100-1
- Update to .NET Core Runtime 3.0.0 and SDK 3.0.100
- Resolves: RHBZ#1711403