Update repository to .NET 6.0.30x and address build issues (#1462)
* Update to .NET 6.0.302 * Rely on Global.json for .NET version selection * Add component governance exclusion for test directories that don't ship code * Update Newtonsoft version to 13.0.1 (#1485) * Update dependencies on Nuget.* to 6.2.1 * Removing LanguageServer tests * Restart build to pickup change from qsharp-runtime Co-authored-by: Bettina Heim <Bettina.Heim@microsoft.com> Co-authored-by: Andres Paz <anpaz@microsoft.com>
This commit is contained in:
Ricardo Espinoza
GitHub
Родитель
4e88c97f8f
Коммит
add3fe1338
|
|
@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LanguageServer", "src\QsCom
|
|||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Tests.Compiler", "src\QsCompiler\Tests.Compiler\Tests.Compiler.fsproj", "{2F99F17D-ACDC-4F81-B9DA-02B88C747BEE}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.LanguageServer", "src\QsCompiler\Tests.LanguageServer\Tests.LanguageServer.csproj", "{F015C380-D285-42B1-9DAF-B6422CECA2F2}"
|
||||
EndProject
|
||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Core", "src\QsCompiler\Core\Core.fsproj", "{03626B99-9544-4909-8071-1EF2E5498FEE}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Transformations", "src\QsCompiler\Transformations\Transformations.csproj", "{BA5D3733-09F1-4676-9CAC-99AD9A00AECB}"
|
||||
|
|
@ -181,18 +179,6 @@ Global
|
|||
{2F99F17D-ACDC-4F81-B9DA-02B88C747BEE}.Release|x64.Build.0 = Release|Any CPU
|
||||
{2F99F17D-ACDC-4F81-B9DA-02B88C747BEE}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{2F99F17D-ACDC-4F81-B9DA-02B88C747BEE}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{03626B99-9544-4909-8071-1EF2E5498FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{03626B99-9544-4909-8071-1EF2E5498FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{03626B99-9544-4909-8071-1EF2E5498FEE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -451,7 +437,6 @@ Global
|
|||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{2F99F17D-ACDC-4F81-B9DA-02B88C747BEE} = {B4A9484D-31FC-4A27-9E26-4C8DE3E02D77}
|
||||
{F015C380-D285-42B1-9DAF-B6422CECA2F2} = {B4A9484D-31FC-4A27-9E26-4C8DE3E02D77}
|
||||
{256A6275-FC7F-42E9-9931-BC6EA6D0F31A} = {B4A9484D-31FC-4A27-9E26-4C8DE3E02D77}
|
||||
{76BA96DA-DC1E-4315-A3ED-5F0700A79812} = {6077A717-50BF-4F87-B439-CA549AF6A4AE}
|
||||
{D50583DF-FBEF-45EF-B523-70B2CDBE1DD1} = {76BA96DA-DC1E-4315-A3ED-5F0700A79812}
|
||||
|
|
|
|||
|
|
@ -48,9 +48,9 @@ jobs:
|
|||
- job: Style
|
||||
steps:
|
||||
- task: UseDotNet@2
|
||||
displayName: Use .NET SDK 6.0.105
|
||||
displayName: Use .NET SDK 6.0.300
|
||||
inputs:
|
||||
version: 6.0.105
|
||||
useGlobalJson: true
|
||||
|
||||
- script: dotnet tool restore
|
||||
displayName: Restore .NET tools
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ steps:
|
|||
versionSpec: 5.8.1
|
||||
|
||||
- task: UseDotNet@2
|
||||
displayName: Use .NET SDK 6.0.105
|
||||
displayName: Use .NET SDK 6.0.300
|
||||
inputs:
|
||||
version: 6.0.105
|
||||
useGlobalJson: true
|
||||
|
||||
- task: UseDotNet@2
|
||||
displayName: Use .NET Core SDK 3.1.416
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ jobs:
|
|||
displayName: 'Use .NET Core sdk'
|
||||
inputs:
|
||||
packageType: sdk
|
||||
version: 6.x
|
||||
useGlobalJson: true
|
||||
installationPath: $(Agent.ToolsDirectory)/dotnet
|
||||
|
||||
- pwsh: ./llvm-build/libllvm.ps1
|
||||
|
|
|
|||
|
|
@ -31,3 +31,4 @@ steps:
|
|||
condition: succeededOrFailed()
|
||||
inputs:
|
||||
failOnAlert: true
|
||||
ignoreDirectories: 'src/QsCompiler/Tests.LanguageServer,src/QsCompiler/TestProjects'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "6.0.100",
|
||||
"rollForward": "patch"
|
||||
"version": "6.0.302",
|
||||
"rollForward": "latestPatch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,13 +24,14 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
||||
<PackageReference Include="Microsoft.Build" Version="16.9.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build" Version="17.2.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build.Framework" Version="17.2.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.2.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.2.8" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="NuGet.ProjectModel" Version="6.2.1" />
|
||||
<PackageReference Include="NuGet.ProjectModel" Version="6.2.1" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="NuGet.Frameworks" Version="6.2.1" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="StreamJsonRpc" Version="2.7.76" />
|
||||
<PackageReference Include="System.Reactive" Version="4.4.1" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "6.0.100",
|
||||
"rollForward": "latestFeature"
|
||||
"version": "6.0.302",
|
||||
"rollForward": "latestPatch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,10 +16,11 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.2.2105" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
|
||||
<PackageReference Include="System.IO.Pipelines" Version="6.0.1" />
|
||||
<PackageReference Include="System.IO.Pipes" Version="4.3.0" />
|
||||
<PackageReference Include="NuGet.Frameworks" Version="6.2.1-rc.7" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
|
||||
<PackageReference Include="xunit" Version="2.4.0" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" ExcludeAssets="runtime" />
|
||||
<PackageReference Include="NuGet.ProjectModel" Version="6.0.0" />
|
||||
<PackageReference Include="NuGet.ProjectModel" Version="6.2.1" />
|
||||
<PackageReference Include="NuGet.Frameworks" Version="6.2.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
|
||||
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -14,5 +14,6 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Applications.Events.Client" Version="1.1.1.337" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче