diff --git a/src/QsCompiler/TestTargets/Simulation/Example/Example.csproj b/src/QsCompiler/TestTargets/Simulation/Example/Example.csproj index 0de3627b7b..ebd8eabfeb 100644 --- a/src/QsCompiler/TestTargets/Simulation/Example/Example.csproj +++ b/src/QsCompiler/TestTargets/Simulation/Example/Example.csproj @@ -1,69 +1,47 @@ - + + + Detailed Exe netcoreapp3.0 - x64 - 0.10 + false - - - false - - - false - - - - - ExecutionTests\ - generated\ - "..\Target\bin\$(Configuration)\netstandard2.1\Simulation.dll" + generated/ + ExecutionTests/ + ../Target/bin/$(Configuration)/netstandard2.1/Simulation.dll + --load $(SimulationTarget) dotnet "../../../CommandLineTool/bin/$(Configuration)/netcoreapp3.0/qsc.dll" - - - + + + false - + $(ExecutionTestsDir)%(RecursiveDir)%(Filename)%(Extension) - + + + + + + false + + + false + + - + - - + - - - - - - - - - - - - - - - - - - $(QscExe) build -v diag --format MsBuild --proj "$(MSBuildProjectName)" -i "@(QsSourceFiles,'" "')" -r "@(QsReferences,'" "')" -o $(GenFilesDir) --load "$(SimulationTarget)" - - - - - - - - + + + diff --git a/src/QuantumSdk/DefaultItems/DefaultItems.targets b/src/QuantumSdk/DefaultItems/DefaultItems.targets index f6863306f2..764107d873 100644 --- a/src/QuantumSdk/DefaultItems/DefaultItems.targets +++ b/src/QuantumSdk/DefaultItems/DefaultItems.targets @@ -42,12 +42,15 @@ $([System.String]::Copy('$(AssemblyName)').Replace(' ','')) $(BaseIntermediateOutputPath)qsharp/ + $([MSBuild]::Unescape('$(GeneratedFilesOutputPath)').Replace('\','/')) $(GeneratedFilesOutputPath)/ $(GeneratedFilesOutputPath)docs/ + $([MSBuild]::Unescape('$(QsharpDocsOutputPath)').Replace('\','/')) $(QsharpDocsOutputPath)/ $(GeneratedFilesOutputPath)config/ + $([MSBuild]::Unescape('$(QscBuildConfigOutputPath)').Replace('\','/')) $(QscBuildConfigOutputPath)/ @@ -56,30 +59,23 @@ - - <_RelevantQscProjectReference Remove="@(_RelevantQscProjectReference)"/> <_RelevantQscProjectReference Include="@(QscProjectReference->WithMetadataValue('ExecutionTarget',''))" /> <_RelevantQscProjectReference Include="@(QscProjectReference->WithMetadataValue('ExecutionTarget','Any'))" /> <_RelevantQscProjectReference Include="@(QscProjectReference->WithMetadataValue('ExecutionTarget','$(ExecutionTarget)'))" /> - - <_RelevantQscPackageReference Remove="@(_RelevantQscPackageReference)"/> <_RelevantQscPackageReference Include="@(QscPackageReference->WithMetadataValue('ExecutionTarget',''))" /> <_RelevantQscPackageReference Include="@(QscPackageReference->WithMetadataValue('ExecutionTarget','Any'))" /> <_RelevantQscPackageReference Include="@(QscPackageReference->WithMetadataValue('ExecutionTarget','$(ExecutionTarget)'))" /> - <_RelevantQscPackageReferencePathProperty Remove="@(_RelevantQscPackageReferencePathProperty)"/> <_RelevantQscPackageReferencePathProperty Include="@(_RelevantQscPackageReference->'Pkg$([System.String]::Copy('%(_RelevantQscPackageReference.Identity)').Replace('.','_'))')" /> - - + BeforeTargets="BeforeCsharpCompile;BeforeBuild"> @@ -79,6 +62,8 @@ + + @@ -88,8 +73,8 @@ <_QscCommandInputFlag Condition="@(QsharpCompile->Count()) > 0">--input "@(QsharpCompile,'" "')" <_QscCommandReferencesFlag Condition="@(ResolvedQsharpReferences->Count()) > 0">--references "@(ResolvedQsharpReferences,'" "')" <_QscCommandLoadFlag Condition="@(_PrioritizedResolvedQscReferences->Count()) > 0">--load "@(_PrioritizedResolvedQscReferences,'" "')" - <_QscPackageLoadFallbackFoldersFlag Condition="'$(OutputPath)' != '' And '$(MSBuildProjectDirectory)' != ''">--package-load-fallback-folders $(MSBuildProjectDirectory)/$(OutputPath) - <_QscCommandArgs>--proj "$(PathCompatibleAssemblyName)" $(_QscCommandDocsFlag) $(_QscCommandInputFlag) $(_QscCommandOutputFlag) $(_QscCommandReferencesFlag) $(_QscCommandLoadFlag) $(_QscPackageLoadFallbackFoldersFlag) + <_QscPackageLoadFallbackFoldersFlag Condition="@(ResolvedPackageLoadFallbackFolders->Count()) > 0">--package-load-fallback-folders "@(ResolvedPackageLoadFallbackFolders,'" "')" + <_QscCommandArgs>--proj "$(PathCompatibleAssemblyName)" $(_QscCommandDocsFlag) $(_QscCommandInputFlag) $(_QscCommandOutputFlag) $(_QscCommandReferencesFlag) $(_QscCommandLoadFlag) $(_QscPackageLoadFallbackFoldersFlag) $(AdditionalQscArguments) <_QscCommandArgsFile>$(QscBuildConfigOutputPath)qsc.rsp $(QscExe) build --format MsBuild $(_VerbosityFlag) --response-files $(_QscCommandArgsFile)