Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cross platform acceptance tests #2653

Merged
merged 88 commits into from
Nov 30, 2020
Merged

Cross platform acceptance tests #2653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
5e78ff6
Linux build fix
nohwnd Jul 3, 2020
28742e0
a
nohwnd Jul 9, 2020
ed1b723
aaa
nohwnd Jul 9, 2020
c470098
build works
nohwnd Jul 15, 2020
19930ae
Run tests on linux
nohwnd Jul 15, 2020
200376b
Use 18.04
nohwnd Jul 15, 2020
18edda6
Add ref
nohwnd Jul 15, 2020
80b1e93
Actually update Ubuntu version
nohwnd Jul 15, 2020
5b882eb
Merge branch 'linux-build' into linux-test
nohwnd Jul 15, 2020
339ab72
Common unit tests fixed
nohwnd Jul 15, 2020
71b2252
Procdump
nohwnd Jul 16, 2020
d8a3c2a
Merge branch 'linux-build' of https://github.com/nohwnd/vstest into l…
nohwnd Jul 16, 2020
ed3e665
Merge branch 'linux-build' into linux-test
nohwnd Jul 16, 2020
6bf5ba5
Skip Vanguard tests
nohwnd Jul 16, 2020
5f32ca4
Fix collector test
nohwnd Jul 16, 2020
18ab4a7
Fix Client.UnitTests
nohwnd Jul 17, 2020
cbb45f8
One test to go on WIndows
nohwnd Jul 21, 2020
410bd44
a
nohwnd Jul 21, 2020
448a87a
Merge
nohwnd Jul 21, 2020
1444436
f
nohwnd Jul 21, 2020
24ce022
fix
nohwnd Jul 22, 2020
baef3ae
aaa
nohwnd Jul 22, 2020
7a07849
Exclude blame
nohwnd Jul 23, 2020
0dba966
Fixed linux build
Haplois Nov 3, 2020
084d870
Merge pull request #1 from Haplois/linux-build-fix
nohwnd Nov 4, 2020
ab7c4cc
Enable linux build in PR
nohwnd Nov 4, 2020
fa21316
Merge branch 'master' of https://github.com/microsoft/vstest into master
nohwnd Nov 4, 2020
4d87208
Merge branch 'master' into enable-linux-build
nohwnd Nov 4, 2020
c07eac7
Merge master
nohwnd Nov 4, 2020
b774394
include tuple
nohwnd Nov 4, 2020
066cc2b
fff
nohwnd Nov 4, 2020
7483075
Merge branch 'enable-linux-build' into linux-test
nohwnd Nov 4, 2020
500f8ce
fix IsTestProject
nohwnd Nov 4, 2020
3edaa2d
exclude logs
nohwnd Nov 4, 2020
2a11826
Remove logs
nohwnd Nov 4, 2020
d2abaf3
Fix Microsoft.TestPlatform.ObjectModel.UnitTests
nohwnd Nov 4, 2020
bd3d852
Fix tests
nohwnd Nov 4, 2020
745487d
Fix vstest.console.UnitTests
nohwnd Nov 4, 2020
4daa670
Merge branch 'master' into linux-test
nohwnd Nov 4, 2020
0d1af5c
Fix merge conflict
nohwnd Nov 4, 2020
ed53ebe
Fixing build
nohwnd Nov 5, 2020
4df489b
Fix build for mac
nohwnd Nov 5, 2020
b7231e7
Add missing ;
nohwnd Nov 5, 2020
a06a688
fix more unit tests
nohwnd Nov 6, 2020
781fd6e
Remove system.valuetuple because it does not build on mono with the c…
nohwnd Nov 6, 2020
ddf0da9
Fix resources again, because they depend on the way we store them on …
nohwnd Nov 6, 2020
81e8a83
Fix vsconsole tests
nohwnd Nov 6, 2020
81135a6
Fix runtime info
nohwnd Nov 6, 2020
4326bdc
Skip socket test
nohwnd Nov 6, 2020
58399d4
Fix my own review comments
nohwnd Nov 6, 2020
7cdf093
Fix Windows test
nohwnd Nov 6, 2020
70d0751
MacOS build and test
nohwnd Nov 6, 2020
89d5c04
remove duplicate Linux job
nohwnd Nov 6, 2020
532d28c
Address review comments
nohwnd Nov 9, 2020
a0be59e
Update azure-pipelines.yml for Azure Pipelines
nohwnd Nov 9, 2020
73d128e
Use Build.SourcesDirectory
nohwnd Nov 9, 2020
ef3b911
Fix some tests
nohwnd Nov 9, 2020
99eabd9
Merge branch 'master' into linux-acceptance-test
nohwnd Nov 20, 2020
ff23a61
Merge branch 'master' of https://github.com/microsoft/vstest into lin…
nohwnd Nov 23, 2020
5c7f57b
Merge branch 'master' of https://github.com/microsoft/vstest into lin…
nohwnd Nov 23, 2020
2893b69
Pass changes
nohwnd Nov 23, 2020
9d57246
Merge branch 'linux-acceptance-test' of https://github.com/nohwnd/vst…
nohwnd Nov 23, 2020
bdd6031
Skipping tests I could not fix
nohwnd Nov 24, 2020
048f6a4
Add acceptance test run
nohwnd Nov 24, 2020
7c6ffa7
Fix loop to parse more than 1 parameter
nohwnd Nov 24, 2020
e78b91d
Merge branch 'linux-acceptance-test' into linux-multi-job-build
nohwnd Nov 24, 2020
f0ca734
Upload and download artifacts
nohwnd Nov 24, 2020
15e02df
Update azure-pipelines.yml for Azure Pipelines
nohwnd Nov 24, 2020
d447cdd
Fix slash
nohwnd Nov 24, 2020
00d5278
Revert externals
nohwnd Nov 24, 2020
bd6e17c
Update azure-pipelines.yml for Azure Pipelines
nohwnd Nov 25, 2020
e9b0070
Update azure-pipelines.yml for Azure Pipelines
nohwnd Nov 25, 2020
a0a448b
Merge branch 'master' into dev/jajares/linux-acceptance-tests
nohwnd Nov 25, 2020
38a99e7
Skip one more
nohwnd Nov 25, 2020
27f390a
Skip some steps
nohwnd Nov 25, 2020
998197e
Build on acceptance
nohwnd Nov 25, 2020
60389ff
Update azure-pipelines.yml for Azure Pipelines
nohwnd Nov 25, 2020
130c117
Skip some steps
nohwnd Nov 25, 2020
e3ea487
Merge branch 'dev/jajares/linux-acceptance-tests' of https://github.c…
nohwnd Nov 25, 2020
18c77bc
Remove (
nohwnd Nov 25, 2020
8a53142
List files
nohwnd Nov 25, 2020
8170047
AAAAAArgh!!!
nohwnd Nov 25, 2020
4b1c0ac
Copy packages to temp dir right after publish
nohwnd Nov 26, 2020
83f3a9d
Create packages dir
nohwnd Nov 27, 2020
c26a3d0
Make output longer
nohwnd Nov 27, 2020
53b6e98
Use Windows-Review tag
nohwnd Nov 30, 2020
8328840
Add Windows-Review filter
nohwnd Nov 30, 2020
f49078b
Apply suggestions from code review
nohwnd Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed linux build
  • Loading branch information
@Haplois
Haplois committed Nov 3, 2020
commit 0dba9660d6444901f63b52b2ab5efcf55f7911e5
10 changes: 6 additions & 4 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,16 @@ function install_cli()
return 1
fi
chmod u+x $install_script
# Get netcoreapp1.1 shared components
$install_script --runtime dotnet --version "2.1.0" --channel "release/2.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64
$install_script --runtime dotnet --version "3.1.0" --channel "release/3.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64

log "install_cli: Get the latest dotnet cli toolset..."
$install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "master" --version $DOTNET_CLI_VERSION

# Get netcoreapp1.1 shared components
$install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "release/2.1.0" --version "2.1.0" --runtime dotnet
#log "install_cli: Get shared components which is compatible with dotnet cli version $DOTNET_CLI_VERSION..."
#$install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "master" --version $DOTNET_RUNTIME_VERSION --runtime dotnet

log " ---- dotnet x64"
"$TP_DOTNET_DIR/dotnet" --info
fi

local dotnet_path=$(_get_dotnet_path)
Expand Down
7 changes: 2 additions & 5 deletions ...soft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
<TargetFrameworks>netcoreapp2.1;net451;uap10.0;netstandard2.0;netstandard1.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netstandard2.0;netstandard1.0;net451</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.0;netcoreapp2.1</TargetFrameworks>
<EnableCodeAnalysis>true</EnableCodeAnalysis>
<NoWarn>NU1605</NoWarn>
Expand All @@ -21,10 +22,6 @@
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>

<!-- On non windows environment, make UAP behave like desktop .NET framework -->
<TargetFrameworkIdentifier Condition="'$(OS)' != 'Windows_NT'">.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion Condition="'$(OS)' != 'Windows_NT'">v4.5.1</TargetFrameworkVersion>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
Expand Down
10 changes: 6 additions & 4 deletions src/datacollector/datacollector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
</PropertyGroup>
<PropertyGroup>
<AssemblyName>datacollector</AssemblyName>
<TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);net451</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.1</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
<PlatformTarget Condition="$(TargetFramework.StartsWith('net4'))">AnyCPU</PlatformTarget>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
Expand All @@ -29,7 +31,7 @@
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
Expand Down
2 changes: 1 addition & 1 deletion test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand Down