Updated to .net 5

.github/workflows/build.yml

@@ -50,8 +50,6 @@ jobs:
 
  - name: Setup .NET Core
  uses: actions/[email protected]
- with:
- dotnet-version: 3.1.301
 
  - name: Build
  run: dotnet build --configuration ${{ matrix.configuration }}
@@ -71,13 +69,13 @@ jobs:
  if: ${{ matrix.publishLanguageServer == 'true' }}
  with:
  name: Bicep.LangServer
- path: ./src/Bicep.LangServer/bin/${{ matrix.configuration }}/netcoreapp3.1/publish/*
+ path: ./src/Bicep.LangServer/bin/${{ matrix.configuration }}/net5.0/publish/*
 
  - name: Upload Bicep
  uses: actions/upload-artifact@v2
  with:
  name: bicep-${{ matrix.configuration }}-${{ matrix.rid }}
- path: ./src/Bicep.Cli/bin/${{ matrix.configuration }}/netcoreapp3.1/${{ matrix.rid }}/publish/*
+ path: ./src/Bicep.Cli/bin/${{ matrix.configuration }}/net5.0/${{ matrix.rid }}/publish/*
  if-no-files-found: error
 
  - name: Upload Code Coverage
@@ -98,8 +96,6 @@ jobs:
 
  - name: Setup .NET Core
  uses: actions/[email protected]
- with:
- dotnet-version: 3.1.301
 
  - name: Download Bicep CLI
  uses: actions/download-artifact@v2
@@ -187,8 +183,6 @@ jobs:
 
  - name: Setup .NET Core
  uses: actions/[email protected]
- with:
- dotnet-version: 3.1.301
 
  - name: Setup Node.js
  uses: actions/[email protected]

azure-pipelines.yml

@@ -10,17 +10,26 @@ pool:
  vmImage: 'ubuntu-latest'
 
 steps:
-- task: DotNetCoreCLI@2
- inputs:
- command: 'restore'
- projects: '**/*.csproj'
- feedsToUse: 'config'
- nugetConfigPath: 'NuGet.config'
- noCache: true
- verbosityRestore: 'Normal'
-- task: ComponentGovernanceComponentDetection@0
- inputs:
- scanType: 'Register'
- verbosity: 'Verbose'
- alertWarningLevel: 'High'
- failOnAlert: true
+ - task: UseDotNet@2
+ displayName: Setup .NET Core
+ continueOnError: true
+ inputs:
+ packageType: 'sdk'
+ useGlobalJson: true
+ performMultiLevelLookup: true
+
+ - task: DotNetCoreCLI@2
+ inputs:
+ command: 'restore'
+ projects: '**/*.csproj'
+ feedsToUse: 'config'
+ nugetConfigPath: 'NuGet.config'
+ noCache: true
+ verbosityRestore: 'Normal'
+
+ - task: ComponentGovernanceComponentDetection@0
+ inputs:
+ scanType: 'Register'
+ verbosity: 'Verbose'
+ alertWarningLevel: 'High'
+ failOnAlert: true

global.json

@@ -4,7 +4,7 @@
  },
  "sdk": {
  "allowPrerelease": false,
- "version": "3.1.301",
+ "version": "5.0.100",
  "rollForward": "latestFeature"
  }
 }

src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.Cli/Bicep.Cli.csproj

@@ -2,9 +2,11 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
  <AssemblyName>bicep</AssemblyName>
  <StartupObject>Bicep.Cli.Program</StartupObject>
+ <!-- .net 5 by default does not package up the native dependencies -->
+ <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
  </PropertyGroup>
 
  <ItemGroup>

src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.Core.Samples/Bicep.Core.Samples.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.Core.UnitTests/Bicep.Core.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>
@@ -11,7 +11,7 @@
  <PackageReference Include="JsonDiffPatch.Net" Version="2.2.0" />
  <PackageReference Include="DiffPlex" Version="1.6.3" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
- <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.3" />
+ <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.0" />
  <PackageReference Include="Moq" Version="4.15.1" />
  <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
  <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
@@ -20,7 +20,7 @@
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
  <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
- <PackageReference Include="System.Management.Automation" Version="7.0.3" />
+ <PackageReference Include="System.Management.Automation" Version="7.1.0" />
  </ItemGroup>
 
  <ItemGroup>

src/Bicep.Core.UnitTests/Utils/FileHelper.cs

@@ -16,7 +16,7 @@ public static string GetResultFilePath(TestContext testContext, string fileName)
  {
  string filePath = Path.Combine(testContext.TestRunResultsDirectory, testContext.TestName, fileName);
 
- Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+ Directory.CreateDirectory(Path.GetDirectoryName(filePath) ?? throw new AssertFailedException($"There is no directory path for file '{filePath}'."));
  testContext.AddResultFile(filePath);
 
  return filePath;
@@ -45,7 +45,7 @@ public static string SaveEmbeddedResourcesWithPathPrefix(TestContext testContext
  }
 
  var filePath = Path.Combine(outputDirectory, relativePath);
- var directoryPath = Path.GetDirectoryName(filePath);
+ var directoryPath = Path.GetDirectoryName(filePath) ?? throw new AssertFailedException($"There is no directory path for file '{filePath}'.");
  Directory.CreateDirectory(directoryPath);
 
  var fileStream = File.Create(filePath);

src/Bicep.LangServer.IntegrationTests/Bicep.LangServer.IntegrationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.LangServer.UnitTests/Bicep.LangServer.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>

src/Bicep.LangServer.UnitTests/BicepCompletionProviderTests.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Bicep.Core;
+using Bicep.Core.Extensions;
 using Bicep.Core.Navigation;
 using Bicep.Core.Parser;
 using Bicep.Core.SemanticModel;
@@ -46,7 +47,7 @@ public void DeclarationSnippetsShouldBeValid()
  snippetCompletions.Should().OnlyContain(c => LanguageConstants.DeclarationKeywords.Contains(c.Label));
  snippetCompletions.Should().OnlyContain(c => c.Documentation!.HasMarkupContent && c.Documentation.MarkupContent!.Kind == MarkupKind.Markdown);
 
- var snippetsByDetail = snippetCompletions.ToDictionary(c => c.Detail);
+ var snippetsByDetail = snippetCompletions.Where(c => c.Detail != null).ToImmutableDictionaryExcludingNull(c => c.Detail, StringComparer.Ordinal);
 
  var replacementsByDetail = new Dictionary<string, IList<string>>
  {

src/Bicep.LangServer/Bicep.LangServer.csproj

@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
  <RootNamespace>Bicep.LanguageServer</RootNamespace>
  </PropertyGroup>
 

src/Bicep.Wasm/Bicep.Wasm.csproj

@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
  <PropertyGroup>
- <TargetFramework>netstandard2.1</TargetFramework>
+ <TargetFramework>net5.0</TargetFramework>
  <RazorLangVersion>3.0</RazorLangVersion>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
  <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
  </ItemGroup>
 

src/Bicep.Wasm/Program.cs

@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -16,7 +18,7 @@ public static async Task Main(string[] args)
  {
  var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
- var jsRuntime = builder.Services.BuildServiceProvider().GetService<IJSRuntime>();
+ var jsRuntime = builder.Services.BuildServiceProvider().GetService<IJSRuntime>() ?? throw new InvalidOperationException("Unable to obtain JS runtime.");
  await jsRuntime.InvokeAsync<object>("BicepInitialize", DotNetObjectReference.Create(new Interop(jsRuntime)));
 
  await builder.Build().RunAsync();

src/playground/src/lspInterop.ts

@@ -9,7 +9,7 @@ export function initializeInterop(self): Promise<boolean> {
  resolve(true);
  }
 
- const test = require('../../Bicep.Wasm/bin/Release/netstandard2.1/wwwroot/_framework/blazor.webassembly.js'); 
+ const test = require('../../Bicep.Wasm/bin/Release/net5.0/wwwroot/_framework/blazor.webassembly.js'); 
  });
 }
 

src/playground/webpack.config.js

@@ -36,7 +36,7 @@ module.exports = {
  plugins: [
  new CopyPlugin({
  patterns: [
- { from: '../Bicep.Wasm/bin/Release/netstandard2.1/wwwroot/_framework', to: './_framework/' },
+ { from: '../Bicep.Wasm/bin/Release/net5.0/wwwroot/_framework', to: './_framework/' },
  ],
  }),
  new HtmlWebpackPlugin({

src/vscode-bicep/src/language/client.ts

@@ -12,7 +12,7 @@ import {
 } from "vscode-azureextensionui";
 import { ErrorAction, Message, CloseAction } from "vscode-languageclient/node";
 
-const dotnetRuntimeVersion = "3.1";
+const dotnetRuntimeVersion = "5.0";
 const packagedServerPath = "bicepLanguageServer/Bicep.LangServer.dll";
 const extensionId = "ms-azuretools.vscode-bicep";