Browse code
powershell: Upgrade to version 6.1.1
Upgrading dotnet-runtime and dotnet-sdk as well to supporting upgrade to powershell to 6.1.1.
Change-Id: I1fe4df6742ea8cc68d22388ef4ab98a066dd8357
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6502
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Ajay Kaher <akaher@vmware.com>
dweepadvani authored on 2019/01/14 20:44:07Showing 4 changed files
- SPECS/dotnet-runtime/dotnet-runtime.spec
- SPECS/dotnet-sdk/dotnet-sdk.spec
- SPECS/powershell/build.sh
- SPECS/powershell/powershell.spec
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
Summary: Microsoft .NET Core Runtime |
| 2 | 2 |
Name: dotnet-runtime |
| 3 |
-Version: 2.0.5 |
|
| 3 |
+Version: 2.2.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
Vendor: VMware, Inc. |
| 6 | 6 |
Distribution: Photon |
| 7 | 7 |
License: MIT |
| 8 | 8 |
Url: https://github.com/dotnet/core |
| 9 | 9 |
Group: Development/Tools |
| 10 |
-Source0: https://download.microsoft.com/download/1/1/0/11046135-4207-40D3-A795-13ECEA741B32/dotnet-runtime-2.0.5-linux-x64.tar.gz |
|
| 11 |
-%define sha1 dotnet-runtime=631b1f4a4c07a4488e846fc2142ce74c1b8b84a8 |
|
| 12 | 10 |
BuildArch: x86_64 |
| 11 |
+Source0: https://download.microsoft.com/download/A/7/8/A78F1D25-8D5C-4411-B544-C7D527296D5E/%{name}-%{version}-linux-x64.tar.gz
|
|
| 12 |
+%define sha1 dotnet-runtime=7f9815101143463f2d244fa15c51cc9098328920 |
|
| 13 | 13 |
Requires: curl libunwind krb5 lttng-ust |
| 14 | 14 |
|
| 15 | 15 |
%description |
| ... | ... |
@@ -17,14 +17,14 @@ Requires: curl libunwind krb5 lttng-ust |
| 17 | 17 |
applications, microservices and modern websites. |
| 18 | 18 |
|
| 19 | 19 |
%prep |
| 20 |
-%setup -c dotnet-runtime-%{version}
|
|
| 20 |
+%setup -c %{name}-%{version}
|
|
| 21 | 21 |
|
| 22 | 22 |
%build |
| 23 | 23 |
|
| 24 | 24 |
%install |
| 25 | 25 |
mkdir -p %{buildroot}%{_libdir}/dotnet
|
| 26 |
-mkdir -p %{buildroot}%{_docdir}/dotnet-runtime-%{version}
|
|
| 27 |
-cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-runtime-%{version}
|
|
| 26 |
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
|
|
| 27 |
+cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/%{name}-%{version}
|
|
| 28 | 28 |
rm LICENSE.txt ThirdPartyNotices.txt |
| 29 | 29 |
cp -r * %{buildroot}%{_libdir}/dotnet
|
| 30 | 30 |
mkdir -p %{buildroot}%{_bindir}
|
| ... | ... |
@@ -66,5 +66,7 @@ ln -sf %{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/dotnet
|
| 66 | 66 |
%{_libdir}/*
|
| 67 | 67 |
|
| 68 | 68 |
%changelog |
| 69 |
+* Mon Jan 14 2019 Dweep Advani <dadvani@vmware.com> 2.2.0-1 |
|
| 70 |
+- Upgraded to version 2.2.0 |
|
| 69 | 71 |
* Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.5-1 |
| 70 | 72 |
- Initial build for photon |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
%define debug_package %{nil}
|
| 2 | 2 |
Summary: Microsoft .NET Core SDK |
| 3 | 3 |
Name: dotnet-sdk |
| 4 |
-Version: 2.1.4 |
|
| 4 |
+Version: 2.1.403 |
|
| 5 | 5 |
Release: 1%{?dist}
|
| 6 | 6 |
Vendor: VMware, Inc. |
| 7 | 7 |
Distribution: Photon |
| 8 | 8 |
License: MIT |
| 9 | 9 |
Url: https://github.com/dotnet/core |
| 10 | 10 |
Group: Development/Tools |
| 11 |
-Source0: https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/dotnet-sdk-2.1.4-linux-x64.tar.gz |
|
| 12 |
-%define sha1 dotnet-sdk=0201b2f073dea70abfc00383f8093f8dafa802ea |
|
| 11 |
+Source0: https://download.microsoft.com/download/1/1/5/115B762D-2B41-4AF3-9A63-92D9680B9409/%{name}-%{version}-linux-x64.tar.gz
|
|
| 12 |
+%define sha1 dotnet-sdk=0a72a76e833f20da90a052f634d6711ef62d0526 |
|
| 13 | 13 |
BuildArch: x86_64 |
| 14 | 14 |
Requires: dotnet-runtime icu |
| 15 | 15 |
|
| ... | ... |
@@ -18,15 +18,15 @@ Requires: dotnet-runtime icu |
| 18 | 18 |
applications, microservices and modern websites. |
| 19 | 19 |
|
| 20 | 20 |
%prep |
| 21 |
-%setup -c dotnet-sdk-%{version}
|
|
| 21 |
+%setup -c %{name}-%{version}
|
|
| 22 | 22 |
|
| 23 | 23 |
%build |
| 24 | 24 |
|
| 25 | 25 |
%install |
| 26 | 26 |
mkdir -p %{buildroot}%{_libdir}/dotnet/sdk
|
| 27 |
-mkdir -p %{buildroot}%{_docdir}/dotnet-sdk-%{version}
|
|
| 27 |
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
|
|
| 28 | 28 |
cp -r sdk/%{version} %{buildroot}%{_libdir}/dotnet/sdk
|
| 29 |
-cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-sdk-%{version}
|
|
| 29 |
+cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/%{name}-%{version}
|
|
| 30 | 30 |
|
| 31 | 31 |
%files |
| 32 | 32 |
%defattr(-,root,root,0755) |
| ... | ... |
@@ -34,5 +34,7 @@ cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-sdk-%{version
|
| 34 | 34 |
%{_docdir}/*
|
| 35 | 35 |
|
| 36 | 36 |
%changelog |
| 37 |
+* Mon Jan 14 2019 Dweep Advani <dadvani@vmware.com> 2.1.403-1 |
|
| 38 |
+- upgraded to version 2.1.403 |
|
| 37 | 39 |
* Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.4-1 |
| 38 | 40 |
- Initial build for photon |
| ... | ... |
@@ -13,16 +13,17 @@ dotnet run |
| 13 | 13 |
popd |
| 14 | 14 |
|
| 15 | 15 |
pushd src |
| 16 |
+ |
|
| 16 | 17 |
targetFile="Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets" |
| 17 | 18 |
cat > $targetFile <<-"EOF" |
| 18 | 19 |
<Project> |
| 19 |
- <Target Name="_GetDependencies" |
|
| 20 |
- DependsOnTargets="ResolveAssemblyReferencesDesignTime"> |
|
| 21 |
- <ItemGroup> |
|
| 22 |
- <_RefAssemblyPath Include="%(_ReferencesFromRAR.ResolvedPath)%3B" Condition=" '%(_ReferencesFromRAR.Type)' == 'assembly' And '%(_ReferencesFromRAR.PackageName)' != 'Microsoft.Management.Infrastructure' " /> |
|
| 23 |
- </ItemGroup> |
|
| 24 |
- <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" /> |
|
| 25 |
- </Target> |
|
| 20 |
+ <Target Name="_GetDependencies" |
|
| 21 |
+ DependsOnTargets="ResolveAssemblyReferencesDesignTime"> |
|
| 22 |
+ <ItemGroup> |
|
| 23 |
+ <_RefAssemblyPath Include="%(_ReferencesFromRAR.HintPath)%3B" Condition=" '%(_ReferencesFromRAR.NuGetPackageId)' != 'Microsoft.Management.Infrastructure' "/> |
|
| 24 |
+ </ItemGroup> |
|
| 25 |
+ <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" /> |
|
| 26 |
+ </Target> |
|
| 26 | 27 |
</Project> |
| 27 | 28 |
EOF |
| 28 | 29 |
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 |
| 41 | 41 |
|
| 42 | 42 |
# |
| 43 | 43 |
touch DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY |
| 44 |
-dotnet publish /property:GenerateFullPaths=true --configuration Linux --framework netcoreapp2.0 --runtime linux-x64 src/powershell-unix --output bin |
|
| 44 |
+dotnet publish /property:GenerateFullPaths=true --configuration Linux --framework netcoreapp2.1 --runtime linux-x64 src/powershell-unix --output bin |
|
| 45 |
+ |
|
| 46 |
+# Even after powershell rpm built, dotnet processes are alive, following to kill them: |
|
| 47 |
+killall -15 dotnet |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: PowerShell is an automation and configuration management platform. |
| 2 | 2 |
Name: powershell |
| 3 |
-Version: 6.0.1 |
|
| 3 |
+Version: 6.1.1 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
Vendor: VMware, Inc. |
| 6 | 6 |
Distribution: Photon |
| ... | ... |
@@ -8,11 +8,12 @@ License: MIT |
| 8 | 8 |
Url: https://microsoft.com/powershell |
| 9 | 9 |
Group: shells |
| 10 | 10 |
Source0: %{name}-%{version}.tar.gz
|
| 11 |
-%define sha1 powershell=2aac40c972f45d1abb3a8b3a4d8a87fcbe91b889 |
|
| 11 |
+%define sha1 powershell=03abf8fa557974e5e765743bad870ab03e301e5b |
|
| 12 | 12 |
Source1: build.sh |
| 13 | 13 |
BuildArch: x86_64 |
| 14 |
-BuildRequires: dotnet-sdk = 2.1.4 |
|
| 15 |
-BuildRequires: dotnet-runtime = 2.0.5 |
|
| 14 |
+BuildRequires: dotnet-sdk = 2.1.403 |
|
| 15 |
+BuildRequires: dotnet-runtime = 2.2.0 |
|
| 16 |
+BuildRequires: psmisc |
|
| 16 | 17 |
BuildRequires: cmake |
| 17 | 18 |
BuildRequires: clang |
| 18 | 19 |
BuildRequires: git |
| ... | ... |
@@ -24,8 +25,7 @@ PowerShell is an automation and configuration management platform. |
| 24 | 24 |
It consists of a cross-platform command-line shell and associated scripting language. |
| 25 | 25 |
|
| 26 | 26 |
%prep |
| 27 |
-%setup -qn PowerShell |
|
| 28 |
-sed -i 's/2.0.2/2.1.4/' global.json |
|
| 27 |
+%setup -qn PowerShell-%{version}
|
|
| 29 | 28 |
|
| 30 | 29 |
%build |
| 31 | 30 |
cp %{SOURCE1} .
|
| ... | ... |
@@ -33,13 +33,14 @@ chmod +x ./build.sh |
| 33 | 33 |
./build.sh |
| 34 | 34 |
|
| 35 | 35 |
%install |
| 36 |
-rm -rf src/powershell-unix/bin/{Debug, Linux}
|
|
| 37 |
-mkdir -p %{buildroot}%{_libdir}/powershell
|
|
| 38 |
-mkdir -p %{buildroot}%{_docdir}/powershell
|
|
| 39 |
-mv src/powershell-unix/bin/license_thirdparty_proprietary.txt %{buildroot}%{_docdir}/powershell
|
|
| 40 |
-cp -r src/powershell-unix/bin/* %{buildroot}/%{_libdir}/powershell
|
|
| 36 |
+rm -rf src/%{name}-unix/bin/{Debug, Linux}
|
|
| 37 |
+mkdir -p %{buildroot}%{_libdir}/%{name}
|
|
| 38 |
+mkdir -p %{buildroot}%{_docdir}/%{name}
|
|
| 39 |
+mv src/%{name}-unix/bin/ThirdPartyNotices.txt %{buildroot}%{_docdir}/%{name}
|
|
| 40 |
+mv src/%{name}-unix/bin/LICENSE.txt %{buildroot}%{_docdir}/%{name}
|
|
| 41 |
+cp -r src/%{name}-unix/bin/* %{buildroot}/%{_libdir}/%{name}
|
|
| 41 | 42 |
mkdir -p %{buildroot}%{_bindir}
|
| 42 |
-ln -sf %{_libdir}/powershell/pwsh %{buildroot}%{_bindir}/pwsh
|
|
| 43 |
+ln -sf %{_libdir}/%{name}/pwsh %{buildroot}%{_bindir}/pwsh
|
|
| 43 | 44 |
|
| 44 | 45 |
|
| 45 | 46 |
%files |
| ... | ... |
@@ -50,5 +51,7 @@ ln -sf %{_libdir}/powershell/pwsh %{buildroot}%{_bindir}/pwsh
|
| 50 | 50 |
%{_docdir}/*
|
| 51 | 51 |
|
| 52 | 52 |
%changelog |
| 53 |
+* Mon Jan 14 2019 Dweep Advani <dadvani@vmware.com> 6.1.1-1 |
|
| 54 |
+- upgraded version to 6.1.1 |
|
| 53 | 55 |
* Wed Jan 31 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.0.1-1 |
| 54 | 56 |
- Initial build for photon |