From 8af49184aaa03da37abf6d8f70553d42577fa552 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 09 Jan 2019 15:10:50 +0000
Subject: [PATCH] import rh-dotnet22-dotnet-2.2.102-1.el7

---
 /dev/null                    |  193 ------------------------------------------------
 .rh-dotnet22-dotnet.metadata |    2 
 .gitignore                   |    2 
 SPECS/dotnet.spec            |   20 ++--
 4 files changed, 12 insertions(+), 205 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d64355..7451eed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v2.2.0.tar.gz
+SOURCES/dotnet-2.2.1.tar.gz
diff --git a/.rh-dotnet22-dotnet.metadata b/.rh-dotnet22-dotnet.metadata
index db54816..16a2c2b 100644
--- a/.rh-dotnet22-dotnet.metadata
+++ b/.rh-dotnet22-dotnet.metadata
@@ -1 +1 @@
-0f5a5d6efa3d37cdb120dbcdbb0fb7fceb84aa95 SOURCES/dotnet-v2.2.0.tar.gz
+ffc8d27a948a282b9b1c9e1f909288446a37d53c SOURCES/dotnet-2.2.1.tar.gz
diff --git a/SOURCES/source-build-869-build-log.patch b/SOURCES/source-build-869-build-log.patch
deleted file mode 100644
index 61723c6..0000000
--- a/SOURCES/source-build-869-build-log.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From a542e1977bf264a1a4e26f0e978387668c74b798 Mon Sep 17 00:00:00 2001
-From: Davis Goodin <dagood@microsoft.com>
-Date: Wed, 14 Nov 2018 10:05:41 -0600
-Subject: [PATCH] Set IgnoreStandardErrorWarningFormat on Execs
-
-For every Exec that takes RedirectRepoOutputToLog, ignore standard error/warning format. If it isn't ignored, there might be problems that are ignored by redirecting to the logs that aren't ignored if redirecting is turned off. Configure Exec not to detect these at all to behave the same whether redirecting or not.
----
- repos/application-insights.proj |  9 ++++++---
- repos/dir.targets               | 21 ++++++++++++---------
- repos/netcorecli-fsc.proj       |  3 ++-
- repos/newtonsoft-json.proj      |  3 ++-
- repos/nuget-client.proj         |  9 ++++++---
- repos/roslyn.proj               |  9 ++++++---
- repos/templating.proj           |  3 ++-
- 7 files changed, 36 insertions(+), 21 deletions(-)
-
-diff --git a/repos/application-insights.proj b/repos/application-insights.proj
-index d9d56eb194..64dffe8ecb 100644
---- a/repos/application-insights.proj
-+++ b/repos/application-insights.proj
-@@ -18,14 +18,17 @@
- 
-     <Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(BuildCommandArgs)  "
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <Exec Command="$(DotnetToolCommand) build /bl:build.binlog $(BuildCommandArgs)"
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <Exec Command="$(DotnetToolCommand) pack /bl:pack.binlog $(BuildCommandArgs)"
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- </Project>
-diff --git a/repos/dir.targets b/repos/dir.targets
-index 761e7ae603..b3793b1d04 100644
---- a/repos/dir.targets
-+++ b/repos/dir.targets
-@@ -245,7 +245,10 @@
-     <ItemGroup>
-       <EnvironmentVariables Condition="'$(NUGET_PACKAGES)'!=''" Include="NUGET_PACKAGES=$(NUGET_PACKAGES)" />
-     </ItemGroup>
--    <Exec Command="$(BuildCommand) $(RepoApiArgs) $(RedirectRepoOutputToLog)" WorkingDirectory="$(ProjectDirectory)" EnvironmentVariables="@(EnvironmentVariables)" />
-+    <Exec Command="$(BuildCommand) $(RepoApiArgs) $(RedirectRepoOutputToLog)"
-+          WorkingDirectory="$(ProjectDirectory)"
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- 
-   <Target Name="ReportRepoError">
-@@ -261,7 +264,10 @@
-     <Message Importance="High" Text="  Log: $(RepoConsoleLogFile)" />
-     <Message Importance="High" Text="  With Environment Variables:" />
-     <Message Importance="High" Text="    %(EnvironmentVariables.Identity)" />
--    <Exec Command="$(BuildPackagesCommand) $(RedirectRepoOutputToLog)" WorkingDirectory="$(ProjectDirectory)" EnvironmentVariables="@(EnvironmentVariables)" />
-+    <Exec Command="$(BuildPackagesCommand) $(RedirectRepoOutputToLog)"
-+          WorkingDirectory="$(ProjectDirectory)"
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
-     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Packaging $(ProjectBuildReason)...done" />
-     <OnError ExecuteTargets="ReportRepoError" />
-   </Target>
-@@ -309,13 +315,10 @@
-   </Target>
- 
-   <Target Name="Clean" Condition="'$(CleanCommand)' != ''" >
--    <Exec Command="$(CleanCommand) $(RedirectRepoOutputToLog)" WorkingDirectory="$(ProjectDirectory)" EnvironmentVariables="@(EnvironmentVariables)" />
--  </Target>
--
--  <Target Name="Update"
--          BeforeTargets="Build"
--          Condition="'$(DependencyVersionInputRepoApiImplemented)' != 'true' AND '$(UpdateCommand)' != ''">
--    <Exec Command="$(UpdateCommand) $(RedirectRepoOutputToLog)" WorkingDirectory="$(ProjectDirectory)" EnvironmentVariables="@(EnvironmentVariables)" />
-+    <Exec Command="$(CleanCommand) $(RedirectRepoOutputToLog)"
-+          WorkingDirectory="$(ProjectDirectory)"
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- 
-   <Target Name="SetNuGetPackagesEnvironment" Condition="'$(ArchiveDownloadedPackages)' == 'true'">
-diff --git a/repos/netcorecli-fsc.proj b/repos/netcorecli-fsc.proj
-index c905cf9d81..0422eeb233 100644
---- a/repos/netcorecli-fsc.proj
-+++ b/repos/netcorecli-fsc.proj
-@@ -12,7 +12,8 @@
-   <Target Name="Restore" BeforeTargets="Build" DependsOnTargets="UpdateNuGetConfig">
-     <Exec Command="$(DotnetToolCommand) restore FSharp.NET.Sdk.csproj $(OutputArgs) $(RedirectRepoOutputToLog)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- 
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
-diff --git a/repos/newtonsoft-json.proj b/repos/newtonsoft-json.proj
-index 073f725fa0..9ad089b05a 100644
---- a/repos/newtonsoft-json.proj
-+++ b/repos/newtonsoft-json.proj
-@@ -19,7 +19,8 @@
-   <Target Name="Restore" BeforeTargets="Build" DependsOnTargets="UpdateNuGetConfig">
-     <Exec Command="$(DotnetToolCommand) restore $(NewtonsoftJsonProjectPath) $(DotnetToolCommandArguments) $(RedirectRepoOutputToLog)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- 
-   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
-diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj
-index da135caa8a..d97f550d46 100644
---- a/repos/nuget-client.proj
-+++ b/repos/nuget-client.proj
-@@ -36,11 +36,13 @@
- 
-     <Exec Command="$(BuildCommandBase) /t:RestoreXPLAT /bl:restore.binlog $(RedirectRepoOutputToLog)"
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <Exec Command="$(BuildCommandBase) /t:BuildXPLAT /bl:build.binlog $(RedirectRepoOutputToLog)"
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <PropertyGroup>
-       <PackCommand>$(BuildCommandBase) /t:PackXPlat</PackCommand>
-@@ -53,7 +55,8 @@
- 
-     <Exec Command="$(PackCommand)"
-           EnvironmentVariables="@(EnvironmentVariables)"
--          WorkingDirectory="$(ProjectDirectory)" />
-+          WorkingDirectory="$(ProjectDirectory)"
-+          IgnoreStandardErrorWarningFormat="true" />
-   </Target>
- 
-   <Target Name="InitSubmodules" Condition="Exists('$(ProjectDirectory).git')">
-diff --git a/repos/roslyn.proj b/repos/roslyn.proj
-index 84d05915b2..5601e710cd 100644
---- a/repos/roslyn.proj
-+++ b/repos/roslyn.proj
-@@ -56,7 +56,8 @@
- 
-     <Exec Command="$(DotnetToolCommand) $(RestoreArgs)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring 'roslyn'...done" />
-   </Target>
-@@ -90,7 +91,8 @@
- 
-     <Exec Command="$(DotnetToolCommand) $(PublishCommandArgs) %(PublishWithoutBuildingProject.Identity) $(RedirectRepoOutputToLog)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <PropertyGroup>
-       <PackCommandArgs>pack --no-build</PackCommandArgs>
-@@ -104,7 +106,8 @@
- 
-     <Exec Command="$(DotnetToolCommand) $(PackCommandArgs) -p:NuspecFile=%(NuSpecFiles.Identity) $(RedirectRepoOutputToLog)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Packaging 'roslyn'...done" />
-   </Target>
-diff --git a/repos/templating.proj b/repos/templating.proj
-index 568949f865..91a84908c6 100644
---- a/repos/templating.proj
-+++ b/repos/templating.proj
-@@ -38,7 +38,8 @@
- 
-     <Exec Command="$(DotnetToolCommand) msbuild $(BuildCommandArgs)"
-           WorkingDirectory="$(ProjectDirectory)"
--          EnvironmentVariables="@(EnvironmentVariables)" />
-+          EnvironmentVariables="@(EnvironmentVariables)"
-+          IgnoreStandardErrorWarningFormat="true" />
- 
-     <!-- The templates are built to a different folder than the packages, copy them into the packages folder. -->
-     <ItemGroup>
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 963e185..d822754 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -36,13 +36,13 @@
 %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -re 's/-specs=[^ ]*//g')
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 2.2.0
-%global sdk_version 2.2.100
-%global runtime_version 2.2.0
+%global host_version 2.2.1
+%global sdk_version 2.2.102
+%global runtime_version 2.2.1
 
 Name:           %{?scl_prefix}dotnet
 Version:        %{sdk_version}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Group:          Development/Languages
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
@@ -55,10 +55,8 @@
 # - ./build-source-tarball.sh dotnet-%%{sdk_version}
 # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version}
 
-Source0:        dotnet-v%{runtime_version}.tar.gz
+Source0:        dotnet-%{runtime_version}.tar.gz
 Source1:        check-debug-symbols.py
-
-Patch1:         source-build-869-build-log.patch
 
 Patch100:       corefx-32956-alpn.patch
 Patch101:       corefx-optflags-support.patch
@@ -188,15 +186,13 @@
 applications and micro-services.
 
 %prep
-%setup -q -n %{pkg_name}-v%{runtime_version}
+%setup -q -n %{pkg_name}-%{runtime_version}
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
 
 # Fix bad hardcoded path in build
 sed -i 's|/usr/share/dotnet|%{_libdir}/%{pkg_name}|' src/core-setup/src/corehost/common/pal.unix.cpp
-
-%patch1 -p1
 
 pushd src/corefx
 %patch100 -p1
@@ -298,6 +294,10 @@
 %{_libdir}/%{pkg_name}/sdk/%{sdk_version}
 
 %changelog
+* Tue Dec 18 2018 Omair Majid <omajid@redhat.com> - 2.2.102-1
+- Update to .NET Core Runtime 2.1.2 and SDK 2.2.102
+- Resolves: RHBZ#1660223
+
 * Thu Nov 29 2018 Omair Majid <omajid@redhat.com> - 2.2.100-5
 - Remove bash completion to fix parallel installation with .NET Core 2.1
 - Resolves: RHBZ#1649584

--
Gitblit v1.8.0