diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-07-07 01:23:03 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-07-12 10:50:32 -0700 |
| commit | 8678b0a698d58e59ccca2e2649bb3e923295b9b0 (patch) | |
| tree | e2def7c4ff849e4ddecedf62cde880f39bad732d /src/internal/WixInternal.TestSupport.Native/build | |
| parent | 2b0dff9c5225e3cfddbc1b5a4e78e99f0b0221e4 (diff) | |
| download | wix-8678b0a698d58e59ccca2e2649bb3e923295b9b0.tar.gz wix-8678b0a698d58e59ccca2e2649bb3e923295b9b0.tar.bz2 wix-8678b0a698d58e59ccca2e2649bb3e923295b9b0.zip | |
Update dependencies
Fixes 8569
Diffstat (limited to 'src/internal/WixInternal.TestSupport.Native/build')
| -rw-r--r-- | src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props | 4 | ||||
| -rw-r--r-- | src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props index 966acc0a..2362a8de 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> | 6 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.5.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.5.1\build\xunit.core.props')" /> | 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props')" /> |
| 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props')" /> | 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props')" /> |
| 10 | <PropertyGroup> | 10 | <PropertyGroup> |
| 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets index c070549c..a882ad8d 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets | |||
| @@ -22,28 +22,28 @@ | |||
| 22 | <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> | 22 | <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> |
| 23 | </Reference> | 23 | </Reference> |
| 24 | <Reference Include="xunit.assert"> | 24 | <Reference Include="xunit.assert"> |
| 25 | <HintPath>$(RootPackagesFolder)xunit.assert.2.5.1\lib\netstandard1.1\xunit.assert.dll</HintPath> | 25 | <HintPath>$(RootPackagesFolder)xunit.assert.2.8.1\lib\netstandard1.1\xunit.assert.dll</HintPath> |
| 26 | </Reference> | 26 | </Reference> |
| 27 | <Reference Include="xunit.core"> | 27 | <Reference Include="xunit.core"> |
| 28 | <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.5.1\lib\netstandard1.1\xunit.core.dll</HintPath> | 28 | <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.8.1\lib\netstandard1.1\xunit.core.dll</HintPath> |
| 29 | </Reference> | 29 | </Reference> |
| 30 | <Reference Include="xunit.execution.desktop"> | 30 | <Reference Include="xunit.execution.desktop"> |
| 31 | <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.5.1\lib\net452\xunit.execution.desktop.dll</HintPath> | 31 | <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.8.1\lib\net452\xunit.execution.desktop.dll</HintPath> |
| 32 | </Reference> | 32 | </Reference> |
| 33 | </ItemGroup> | 33 | </ItemGroup> |
| 34 | 34 | ||
| 35 | <Import Project="$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets')" /> | 35 | <Import Project="$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets')" /> |
| 36 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 36 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 37 | <PropertyGroup> | 37 | <PropertyGroup> |
| 38 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 38 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
| 39 | </PropertyGroup> | 39 | </PropertyGroup> |
| 40 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.props'))" /> | 40 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.props'))" /> |
| 41 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets'))" /> | 41 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets'))" /> |
| 42 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props'))" /> | 42 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props'))" /> |
| 43 | </Target> | 43 | </Target> |
| 44 | 44 | ||
| 45 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.5.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " /> | 45 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.8.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " /> |
| 46 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.5.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " /> | 46 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.8.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " /> |
| 47 | <Target Name="Test"> | 47 | <Target Name="Test"> |
| 48 | <!-- https://xunit.net/docs/running-tests-in-msbuild --> | 48 | <!-- https://xunit.net/docs/running-tests-in-msbuild --> |
| 49 | <!-- https://github.com/xunit/xunit/issues/2188 --> | 49 | <!-- https://github.com/xunit/xunit/issues/2188 --> |
