-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #649 from unoplatform/dev/jela/absolutepath
fix: Adjust for IntermediateOutputPath requiring a sub-path of the current project
- Loading branch information
Showing
7 changed files
with
72 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/Uno.Wasm.Tests.AbsoluteIntermediate/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <!-- Defines the bin and obj folder paths --> | ||
| <RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))\</RepoRoot> | ||
| <BaseOutputPath>$(RepoRoot)\artifacts\bin\$(Configuration)\$(Platform)\</BaseOutputPath> | ||
| <OutputPath>$(BaseOutputPath)$(MSBuildProjectName)\</OutputPath> | ||
| <BaseIntermediateOutputPath>$(RepoRoot)\artifacts\obj\$(Platform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | ||
| <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)</IntermediateOutputPath> | ||
| <GeneratedFilesDir>$(BaseIntermediateOutputPath)Generated Files\</GeneratedFilesDir> | ||
| <PackagesConfigRestorePath>$(RepoRoot)packages\</PackagesConfigRestorePath> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
|
|
||
| namespace Uno.Wasm.Test.Empty | ||
| { | ||
| class Program | ||
| { | ||
| static void Main(string[] args) | ||
| { | ||
| Console.WriteLine("Main"); | ||
| } | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/Uno.Wasm.Tests.AbsoluteIntermediate/Uno.Wasm.Tests.AbsoluteIntermediate.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| <OutputType>Exe</OutputType> | ||
| <IsPackable>false</IsPackable> | ||
|
|
||
| <WasmShellMonoRuntimeExecutionMode>InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="System.Collections.Immutable" Version="1.4.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="..\Uno.Wasm.Bootstrap\build\Uno.Wasm.Bootstrap.targets" /> | ||
| <Import Project="..\Uno.Wasm.Bootstrap.DevServer\build\Uno.Wasm.Bootstrap.DevServer.targets" /> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Uno.Wasm.Bootstrap.Cli\Uno.Wasm.Bootstrap.Cli.csproj"> | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> | ||
| <UndefineProperties>TargetFramework</UndefineProperties> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |