Skip to content

Commit

Permalink
Bump sdk version to 5.0.102
Browse files Browse the repository at this point in the history
  • Loading branch information
rstm-sf committed Feb 2, 2021
1 parent 1a39210 commit b8fcdcc
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
url = https://github.com/kekekeks/XamlX.git
[submodule "third_party"]
path = third_party
url = https://github.com/rstm-sf/il-repack.git
branch = infra/retarget_submodule_cecil
39 changes: 31 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
variables:
versionDotNetSdk: 5.0.102
versionDotNetRuntime3: 3.1.x
versionNukeGlobalTool: 5.0.2

jobs:

- job: Linux
pool:
vmImage: 'ubuntu-16.04'
steps:

- task: CmdLine@2
displayName: 'Install Nuke'
inputs:
script: |
dotnet tool install --global Nuke.GlobalTool --version 0.24.0
dotnet tool install --global Nuke.GlobalTool --version ${{ variables.versionNukeGlobalTool }}
- task: CmdLine@2
displayName: 'Run Nuke'
inputs:
Expand All @@ -29,10 +37,18 @@ jobs:
pool:
vmImage: 'macOS-10.15'
steps:

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.401'
displayName: 'Use .NET Core Runtime ${{ variables.versionDotNetRuntime3 }}'
inputs:
version: 3.1.401
packageType: runtime
version: ${{ variables.versionDotNetRuntime3 }}

- task: UseDotNet@2
displayName: 'Use .NET SDK ${{ variables.versionDotNetSdk }}'
inputs:
packageType: 'sdk'
version: ${{ variables.versionDotNetSdk }}

- task: CmdLine@2
displayName: 'Install Mono 5.18'
Expand Down Expand Up @@ -61,7 +77,7 @@ jobs:
displayName: 'Install Nuke'
inputs:
script: |
dotnet tool install --global Nuke.GlobalTool --version 0.24.0
dotnet tool install --global Nuke.GlobalTool --version ${{ variables.versionNukeGlobalTool }}
- task: CmdLine@2
displayName: 'Run Nuke'
Expand Down Expand Up @@ -101,16 +117,24 @@ jobs:
variables:
SolutionDir: '$(Build.SourcesDirectory)'
steps:

- task: UseDotNet@2
displayName: 'Use .NET Core Runtime ${{ variables.versionDotNetRuntime3 }}'
inputs:
packageType: runtime
version: ${{ variables.versionDotNetRuntime3 }}

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.1.401'
displayName: 'Use .NET SDK ${{ variables.versionDotNetSdk }}'
inputs:
version: 3.1.401
packageType: 'sdk'
version: ${{ variables.versionDotNetSdk }}

- task: CmdLine@2
displayName: 'Install Nuke'
inputs:
script: |
dotnet tool install --global Nuke.GlobalTool --version 0.24.0
dotnet tool install --global Nuke.GlobalTool --version ${{ variables.versionNukeGlobalTool }}
- task: CmdLine@2
displayName: 'Run Nuke'
Expand All @@ -136,4 +160,3 @@ jobs:
pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
artifactName: 'Samples'
condition: succeeded()

2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "3.1.401"
"version": "5.0.102"
},
"msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.43",
Expand Down
8 changes: 4 additions & 4 deletions nukebuild/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="5.0.0" />
<PackageReference Include="Nuke.Common" Version="5.0.2" />
<PackageReference Include="xunit.runner.console" Version="2.3.1" />
<PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
<PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
<PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
<!-- Keep in sync with Avalonia.Build.Tasks -->
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Mono.Cecil" Version="0.11.3" />
<PackageReference Include="Pharmacist.Core" Version="1.8.1" />
</ItemGroup>

Expand All @@ -41,6 +40,7 @@

<ItemGroup>
<ProjectReference Include="..\src\tools\MicroComGenerator\MicroComGenerator.csproj" />
<ProjectReference Include="..\third_party\ILRepack\ILRepack.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions third_party
Submodule third_party added at df780d

0 comments on commit b8fcdcc

Please sign in to comment.