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

xproj to csproj migration #217

Merged
merged 63 commits into from
Dec 2, 2016
Merged

xproj to csproj migration #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f914506
Migrated projects using dotnet migrate global.json
Nov 9, 2016
477457c
fixed issues to increase pass percentage.
Nov 11, 2016
97f0d66
Build script working.
Nov 13, 2016
642ee6a
updated formatting.
Nov 13, 2016
eb53162
Uncommented Update-LocalizedResources
Nov 13, 2016
30ec642
resolved merge conflicts
Nov 14, 2016
79005b6
Merge branch 'harshjain2-migrate2' into migrate2
Nov 14, 2016
a907328
Creating folder tools\dotnet in script, it is not created automatically.
Nov 14, 2016
08d4c0e
Creating folder tools\dotnet in script, it is not created automatically.
Nov 14, 2016
ccad660
Fixed issue with package.csproj
Nov 14, 2016
84337f0
Removed msdia package for now.
Nov 14, 2016
a184fe2
build.cmd working.
Nov 14, 2016
5b86715
Reverting RID change.
Nov 14, 2016
6392094
Merge branch 'master' into migrate2
codito Nov 15, 2016
4dd146b
test.cmd working, addd [Ignore] for failing tests.
Nov 15, 2016
8da486b
Modified skipped projects for test run.
Nov 15, 2016
b4b5388
Formatting changes in build.ps1
Nov 15, 2016
e2f3132
Formatted test.ps1
Nov 15, 2016
ae4d0b0
Added csproj only for testing purpose.
Nov 18, 2016
7421eb6
test.cmd working.
Nov 18, 2016
e5eabd6
Removed projects from test folder in build.cmd
Nov 19, 2016
6151b16
Fixed build error related to resources.
Nov 19, 2016
0854393
Removed ignore tag
Nov 20, 2016
087e3b0
removed unnecessary target tags.
Nov 21, 2016
c2b30bb
Merge remote-tracking branch 'upstream/master' into migrate2
Nov 23, 2016
9a0a72c
Extract TestPlatform targets and settings into a common file.
Nov 23, 2016
27b8f22
Include Testplatform targets and settings to csprojs in src folder
smadala Nov 23, 2016
bc4e4e9
Include Testplatform targets and settings to csprojs in test folder
smadala Nov 23, 2016
a2b4b5d
Remove ForTesting* projects. Add workaround for dotnet/sdk #364. Clea…
Nov 24, 2016
d317c57
Migrate testassets projects
smadala Nov 24, 2016
49fe821
Merge https://github.com/harshjain2/vstest into migrate2
smadala Nov 24, 2016
c6f784d
Remove duplicate assembly attributes
smadala Nov 24, 2016
bc3ea92
Remove TestPlatform target from testassets project
smadala Nov 24, 2016
16e0b65
Add TestPlatformMigration solution file
smadala Nov 24, 2016
4f38b40
Update AcceptanceTests proj with TestPlatform targets
smadala Nov 24, 2016
8a2dfc2
Change sign key and change assembly version
smadala Nov 25, 2016
37fa95f
Add oss key to repository.
Nov 27, 2016
fba208b
Rename TestPlatformMigration to TestPlatform solution. Fix acceptance…
Nov 27, 2016
8128219
Use a static version for dev builds.
Nov 27, 2016
2a49efb
Extract common dependencies for test projects.
Nov 27, 2016
a19d987
Extract code analysis settings. Fix build for package.csproj.
Nov 27, 2016
8aeff62
Support discovery of testhost from test project output directory. Fix…
Nov 28, 2016
2d9deba
Change test.ps1 to run netcoreapp1.0 unittests with vstest.console.exe
smadala Nov 28, 2016
69c991e
Use 15.0.0 as dev build version since we're not using side-by-side as…
Nov 28, 2016
7348513
Add package project to sln
smadala Nov 28, 2016
766d6c5
Merge branch 'migrate2' of https://github.com/harshjain2/vstest into …
smadala Nov 28, 2016
24de2a6
Add test cleanup to BaseRunTestsTests
smadala Nov 28, 2016
c176acd
Remove second sn key. Use public sign for builds.
Nov 28, 2016
e1c9e2c
Fix smoke tests.
Nov 29, 2016
ffd812e
Ignore faulty tests.
Nov 29, 2016
ce64be5
Merge remote-tracking branch 'upstream/master' into migrate2
Nov 29, 2016
a2d32ed
Make test run sequential by default.
Nov 29, 2016
9a9e5e6
Ignore vstest.console unit tests as they are hanging.
Nov 29, 2016
48e6679
Fix to display framework in test.cmd log
smadala Nov 29, 2016
cc6e03e
Merge branch 'migrate2' of https://github.com/harshjain2/vstest into …
smadala Nov 29, 2016
f70e9fe
Flatten integration tests. Fix smoke tests build and run.
Nov 29, 2016
9ba345e
Merge branch 'migrate2' of https://github.com/harshjain2/vstest into …
smadala Nov 30, 2016
4ac6010
Run tests from IDE.
Nov 30, 2016
a756af5
Merge branch 'migrate2' of https://github.com/harshjain2/vstest into …
smadala Nov 30, 2016
d201a5c
Remove RuntimeIndentifier for netcoreapps and run netcoreapp unittest…
smadala Nov 30, 2016
3da8166
Fix few build warnings.
Dec 1, 2016
ca02a19
Mark console runner as anycpu bit. Mark experimental support in exten…
Dec 2, 2016
bf1e484
Merge branch 'master' into migrate2
codito Dec 2, 2016
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
895 changes: 617 additions & 278 deletions TestPlatform.sln
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup>
<VersionPrefix>15.0.0</VersionPrefix>
<TargetFramework>net46</TargetFramework>
<AssemblyName>Microsoft.TestPlatform.E2ETest</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="compiler\resources\**\*" />
<Content Include="Adapter\**\*;testhost.x86.exe.config;testhost.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
<Version>15.0.0</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
<ProjectReference Include="..\..\src\testhost\testhost.csproj" />
<ProjectReference Include="..\..\src\testhost.x86\testhost.x86.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ProjectReference>
<ProjectReference Include="..\..\src\vstest.console\vstest.console.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
19 changes: 0 additions & 19 deletions dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.xproj
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions dogfood/Microsoft.TestPlatform.E2ETest/project.json
View file
Open in desktop

This file was deleted.

53 changes: 53 additions & 0 deletions ...tPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
<AssemblyName>Microsoft.TestPlatform.TranslationLayer.E2ETest</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
<Content Include="Adapter\**\*;testhost.x86.exe.config;testhost.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
<ProjectReference Include="..\..\src\testhost\testhost.csproj" />
<ProjectReference Include="..\..\src\testhost.x86\testhost.x86.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ProjectReference>
<ProjectReference Include="..\..\src\vstest.console\vstest.console.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
19 changes: 0 additions & 19 deletions ...stPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/project.json
View file
Open in desktop

This file was deleted.

53 changes: 53 additions & 0 deletions dogfood/UnitTestProject/UnitTestProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />

<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
<AssemblyName>UnitTestProject</AssemblyName>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>1.0.0-alpha-20161104-2</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>1.6.0</Version>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>1.0.4-preview</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App">
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System.Runtime" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
21 changes: 0 additions & 21 deletions dogfood/UnitTestProject/UnitTestProject.xproj
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions global.json
View file
Open in desktop

This file was deleted.

Loading