Browse Source

Merge pull request #1941 from icsharpcode/switchtopwsh

Switch from powershell to pwsh
pull/1968/head
Daniel Grunwald 5 years ago committed by GitHub
parent
commit
46a56440e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  2. 1
      README.md
  3. 2
      appveyor.yml
  4. 4
      azure-pipelines.yml

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -624,9 +624,12 @@
</ItemGroup> </ItemGroup>
<Target Name="ILSpyUpdateAssemblyInfo" BeforeTargets="BeforeBuild"> <Target Name="ILSpyUpdateAssemblyInfo" BeforeTargets="BeforeBuild">
<PropertyGroup> <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<UpdateAssemblyInfo>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/update-assemblyinfo.ps1 $(Configuration)</UpdateAssemblyInfo> <UpdateAssemblyInfo>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/update-assemblyinfo.ps1 $(Configuration)</UpdateAssemblyInfo>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<UpdateAssemblyInfo>pwsh -NoProfile -ExecutionPolicy Bypass -File BuildTools/update-assemblyinfo.ps1 $(Configuration)</UpdateAssemblyInfo>
</PropertyGroup>
<Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" /> <Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" />
</Target> </Target>

1
README.md

@ -59,6 +59,7 @@ If this problem occurs, please manually install the .NET Core 3.1 SDK from [here
Unix / Mac: Unix / Mac:
- Make sure .NET Core 2.1 LTS Runtime is installed (you can get it here: https://get.dot.net). - Make sure .NET Core 2.1 LTS Runtime is installed (you can get it here: https://get.dot.net).
- Make sure [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1) is installed. - Make sure [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1) is installed.
- Make sure [PowerShell](https://github.com/PowerShell/PowerShell) is installed (formerly known as PowerShell Core)
- Check out the repository using git. - Check out the repository using git.
- Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases). - Execute `git submodule update --init --recursive` to download the ILSpy-Tests submodule (used by some test cases).
- Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (.NET Core Global Tool and PowerShell Core). - Use `dotnet build Frontends.sln` to build the non-Windows flavors of ILSpy (.NET Core Global Tool and PowerShell Core).

2
appveyor.yml

@ -8,7 +8,7 @@ image: Visual Studio 2019
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive
- ps: .\BuildTools\appveyor-install.ps1 - pwsh .\BuildTools\appveyor-install.ps1
nuget: nuget:
account_feed: false account_feed: false

4
azure-pipelines.yml

@ -45,9 +45,9 @@ jobs:
version: '3.1.100' version: '3.1.100'
installationPath: $(Agent.ToolsDirectory)/dotnet installationPath: $(Agent.ToolsDirectory)/dotnet
- powershell: .\BuildTools\pipelines-install.ps1 - script: pwsh .\BuildTools\pipelines-install.ps1
displayName: Install displayName: Install
- task: MSBuild@1 - task: MSBuild@1
displayName: Restore ILSpy displayName: Restore ILSpy
inputs: inputs:

Loading…
Cancel
Save