@@ -1,25 +1,15 @@

 Summary:        Microsoft .NET Core Runtime

 Name:           dotnet-runtime

-Version:        2.1.4

+Version:        2.2.0

 Release:        1%{?dist}

 Vendor:         VMware, Inc.

 Distribution:   Photon

 License:        MIT

 Url:            https://github.com/dotnet/core

 Group:          Development/Tools

-

-%ifarch x86_64

-Source0:        https://download.microsoft.com/download/A/7/8/A78F1D25-8D5C-4411-B544-C7D527296D5E/dotnet-runtime-2.1.4-linux-x64.tar.gz

-%define sha1    dotnet-runtime=f92a51b5e15e0d9f48bde76519de911bd86880a0

 BuildArch:      x86_64

-%endif

-

-%ifarch aarch64

-Source0:        https://download.microsoft.com/download/A/7/8/A78F1D25-8D5C-4411-B544-C7D527296D5E/dotnet-runtime-2.1.4-linux-arm64.tar.gz

-%define sha1    dotnet-runtime=0470e1ed3ab4cb3e3321f6dd11f9dc7abac171d6

-BuildArch:      aarch64

-%endif

-

+Source0:        https://download.microsoft.com/download/A/7/8/A78F1D25-8D5C-4411-B544-C7D527296D5E/dotnet-runtime-2.2.0-linux-x64.tar.gz

+%define sha1    dotnet-runtime=7f9815101143463f2d244fa15c51cc9098328920

 Requires:       curl libunwind krb5 lttng-ust

 %description

@@ -76,6 +66,8 @@ ln -sf %{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/dotnet

     %{_libdir}/*

 %changelog

+*   Wed Dec 05 2018 Ajay Kaher <akaher@vmware.com> 2.2.0-1

+-   upgraded to version 2.2.0

 *   Thu Sep 27 2018 Ajay Kaher <akaher@vmware.com> 2.1.4-1

 -   upgraded to version 2.1.4

 -   add aarch64 support

@@ -1,15 +1,15 @@

 %define debug_package %{nil}

 Summary:        Microsoft .NET Core SDK

 Name:           dotnet-sdk

-Version:        2.1.4

+Version:        2.1.403

 Release:        1%{?dist}

 Vendor:         VMware, Inc.

 Distribution:   Photon

 License:        MIT

 Url:            https://github.com/dotnet/core

 Group:          Development/Tools

-Source0:        https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/dotnet-sdk-2.1.4-linux-x64.tar.gz

-%define sha1    dotnet-sdk=0201b2f073dea70abfc00383f8093f8dafa802ea

+Source0:        https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/dotnet-sdk-2.1.403-linux-x64.tar.gz

+%define sha1    dotnet-sdk=0a72a76e833f20da90a052f634d6711ef62d0526

 BuildArch:      x86_64

 Requires:       dotnet-runtime icu

@@ -34,5 +34,7 @@ cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-sdk-%{version

     %{_docdir}/*

 %changelog

+*   Wed Dec 05 2018 Ajay Kaher <akaher@vmware.com> 2.1.403-1

+-   upgraded to version 2.1.403

 *   Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.4-1

 -   Initial build for photon

@@ -13,16 +13,17 @@ dotnet run

 popd

 pushd src

+

 targetFile="Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets"

 cat > $targetFile <<-"EOF"

 <Project>

-  <Target Name="_GetDependencies"

-          DependsOnTargets="ResolveAssemblyReferencesDesignTime">

-    <ItemGroup>

-      <_RefAssemblyPath Include="%(_ReferencesFromRAR.ResolvedPath)%3B" Condition=" '%(_ReferencesFromRAR.Type)' == 'assembly' And '%(_ReferencesFromRAR.PackageName)' != 'Microsoft.Management.Infrastructure' " />

-    </ItemGroup>

-    <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" />

-  </Target>

+    <Target Name="_GetDependencies"

+            DependsOnTargets="ResolveAssemblyReferencesDesignTime">

+        <ItemGroup>

+            <_RefAssemblyPath Include="%(_ReferencesFromRAR.HintPath)%3B"  Condition=" '%(_ReferencesFromRAR.NuGetPackageId)' != 'Microsoft.Management.Infrastructure' "/>

+        </ItemGroup>

+        <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" />

+    </Target>

 </Project>

 EOF

 dotnet msbuild Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj /t:_GetDependencies "/property:DesignTimeBuild=true;_DependencyFile=$(pwd)/TypeCatalogGen/powershell.inc" /nologo

@@ -41,4 +42,7 @@ popd

 #

 touch DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY

-dotnet publish /property:GenerateFullPaths=true --configuration Linux --framework netcoreapp2.0 --runtime linux-x64 src/powershell-unix --output bin

+dotnet publish /property:GenerateFullPaths=true --configuration Linux --framework netcoreapp2.1 --runtime linux-x64 src/powershell-unix --output bin

+

+# Even after powershell rpm built, dotnet processes are alive, following to kill them:

+killall -15 dotnet

@@ -1,18 +1,19 @@

 Summary:        PowerShell is an automation and configuration management platform.

 Name:           powershell

-Version:        6.0.1

-Release:        2%{?dist}

+Version:        6.1.1

+Release:        1%{?dist}

 Vendor:         VMware, Inc.

 Distribution:   Photon

 License:        MIT

 Url:            https://microsoft.com/powershell

 Group:          shells

 Source0:        %{name}-%{version}.tar.gz

-%define sha1    powershell=2aac40c972f45d1abb3a8b3a4d8a87fcbe91b889

+%define sha1    powershell=03abf8fa557974e5e765743bad870ab03e301e5b

 Source1:        build.sh

 BuildArch:      x86_64

-BuildRequires:  dotnet-sdk = 2.1.4

-BuildRequires:  dotnet-runtime = 2.1.4

+BuildRequires:  dotnet-sdk = 2.1.403

+BuildRequires:  dotnet-runtime = 2.2.0

+BuildRequires:  psmisc

 BuildRequires:  cmake

 BuildRequires:  clang

 BuildRequires:  git

@@ -24,8 +25,8 @@ PowerShell is an automation and configuration management platform.

 It consists of a cross-platform command-line shell and associated scripting language.

 %prep

-%setup -qn PowerShell

-sed -i 's/2.0.2/2.1.4/' global.json

+%setup -qn PowerShell-%{version}

+# sed -i 's/2.1.403/2.1.4/' global.json

 %build

 cp %{SOURCE1} .

@@ -36,7 +37,8 @@ chmod +x ./build.sh

 rm -rf src/powershell-unix/bin/{Debug, Linux}

 mkdir -p %{buildroot}%{_libdir}/powershell

 mkdir -p %{buildroot}%{_docdir}/powershell

-mv src/powershell-unix/bin/license_thirdparty_proprietary.txt %{buildroot}%{_docdir}/powershell

+mv src/powershell-unix/bin/ThirdPartyNotices.txt %{buildroot}%{_docdir}/powershell

+mv src/powershell-unix/bin/LICENSE.txt %{buildroot}%{_docdir}/powershell

 cp -r src/powershell-unix/bin/* %{buildroot}/%{_libdir}/powershell

 mkdir -p %{buildroot}%{_bindir}

 ln -sf %{_libdir}/powershell/pwsh %{buildroot}%{_bindir}/pwsh

@@ -50,6 +52,8 @@ ln -sf %{_libdir}/powershell/pwsh %{buildroot}%{_bindir}/pwsh

     %{_docdir}/*

 %changelog

+*   Wed Dec 05 2018 Ajay Kaher <akaher@vmware.com> 6.1.1-1

+-   upgrade version to 6.1.1

 *   Thu Sep 27 2018 Ajay Kaher <akaher@vmware.com> 6.0.1-2

 -   upgrade version of dotnet-runtime

 *   Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.0.1-1