зеркало из https://github.com/microsoft/iqsharp.git
Retarget IQ# netcoreapp3.1 binaries only to net6.0
This commit is contained in:
Родитель
7045cf4510
Коммит
4243b5da63
|
@ -10,7 +10,7 @@
|
|||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
// If you have changed target frameworks, make sure to update the program path.
|
||||
"program": "${workspaceFolder}/src/Tool/bin/Debug/netcoreapp3.1/Microsoft.Quantum.IQSharp.dll",
|
||||
"program": "${workspaceFolder}/src/Tool/bin/Debug/net6.0/Microsoft.Quantum.IQSharp.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/src/Tool",
|
||||
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
|
||||
|
|
|
@ -31,8 +31,8 @@ $artifacts = @{
|
|||
"./src/ExecutionPathTracer/bin/$Env:BUILD_CONFIGURATION/netstandard2.1/Microsoft.Quantum.IQSharp.ExecutionPathTracer.dll",
|
||||
"./src/Jupyter/bin/$Env:BUILD_CONFIGURATION/netstandard2.1/Microsoft.Quantum.IQSharp.Jupyter.dll",
|
||||
"./src/Kernel/bin/$Env:BUILD_CONFIGURATION/netstandard2.1/Microsoft.Quantum.IQSharp.Kernel.dll",
|
||||
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.dll",
|
||||
"./src/Web/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.Web.dll"
|
||||
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/net6.0/Microsoft.Quantum.IQSharp.dll",
|
||||
"./src/Web/bin/$Env:BUILD_CONFIGURATION/net6.0/Microsoft.Quantum.IQSharp.Web.dll"
|
||||
) | ForEach-Object { Join-Path $PSScriptRoot (Join-Path ".." $_) };
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace Microsoft.Quantum.IQSharp
|
|||
}
|
||||
|
||||
// The framework used to find packages.
|
||||
public static NuGetFramework NETCOREAPP3_1 = NuGetFramework.ParseFolder("netcoreapp3.1");
|
||||
public static NuGetFramework NET6_0 = NuGetFramework.ParseFolder("net6.0");
|
||||
|
||||
// Nuget's logger.
|
||||
public NuGetLogger Logger { get; }
|
||||
|
@ -311,7 +311,7 @@ namespace Microsoft.Quantum.IQSharp
|
|||
return files.ToArray();
|
||||
}
|
||||
|
||||
var names = CheckOnFramework(NETCOREAPP3_1);
|
||||
var names = CheckOnFramework(NET6_0);
|
||||
|
||||
Assembly? LoadAssembly(string path)
|
||||
{
|
||||
|
@ -409,7 +409,7 @@ namespace Microsoft.Quantum.IQSharp
|
|||
dependencyBehavior: DependencyBehavior.Lowest,
|
||||
targetIds: new[] { pkgId.Id },
|
||||
requiredPackageIds: Enumerable.Empty<string>(),
|
||||
packagesConfig: Items.Select(p => new PackageReference(p, NETCOREAPP3_1, true)),
|
||||
packagesConfig: Items.Select(p => new PackageReference(p, NET6_0, true)),
|
||||
preferredVersions: Enumerable.Empty<PackageIdentity>(),
|
||||
availablePackages: AvailablePackages,
|
||||
packageSources: Repositories.Select(s => s.PackageSource),
|
||||
|
@ -476,7 +476,7 @@ namespace Microsoft.Quantum.IQSharp
|
|||
var dependencyInfoResource = await repo.GetResourceAsync<DependencyInfoResource>();
|
||||
if (dependencyInfoResource == null) continue;
|
||||
|
||||
var dependencyInfo = await dependencyInfoResource.ResolvePackage(package, NETCOREAPP3_1, context, this.Logger, CancellationToken.None);
|
||||
var dependencyInfo = await dependencyInfoResource.ResolvePackage(package, NET6_0, context, this.Logger, CancellationToken.None);
|
||||
if (dependencyInfo == null) continue;
|
||||
|
||||
AvailablePackages.Add(dependencyInfo);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<IsPackable>false</IsPackable>
|
||||
<NoWarn>1701</NoWarn>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<RootNamespace>Microsoft.Quantum.IQSharp</RootNamespace>
|
||||
<AssemblyName>Microsoft.Quantum.IQSharp</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<RootNamespace>Microsoft.Quantum.IQSharp.Web</RootNamespace>
|
||||
<AssemblyName>Microsoft.Quantum.IQSharp.Web</AssemblyName>
|
||||
|
|
Загрузка…
Ссылка в новой задаче