Skip to content

Set IsPackable=false for new test projects #377

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

Merged
merged 4 commits into from
Mar 1, 2017
Merged

Set IsPackable=false for new test projects #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d214053
Set IsPackable=false for new test projects (dotnet/templating#376).
tintoy Feb 26, 2017
d3bda09
Make IsPackable configurable for test project template (dotnet/templa…
tintoy Feb 27, 2017
27f0c1f
Use '-p' as the short form for '--enable-pack' in MSTest v1 project t…
tintoy Feb 27, 2017
fc0fb70
Implement "--enable-pack" parameter for test project templates (dotne…
tintoy Feb 27, 2017
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
7 changes: 5 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
Expand Down Expand Up @@ -242,4 +242,7 @@ _Pvt_Extensions
Microsoft.TemplateEngine.VC.db

# Dotnet CLI
.dotnet
.dotnet

# Mac
.DS_Store
4 changes: 4 additions & 0 deletions ...tNet.Test.ProjectTemplates.1.x/content/MSTest-CSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...oft.DotNet.Test.ProjectTemplates.1.x/content/MSTest-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
}
],
"defaultValue": "netcoreapp1.1"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.csproj" } ]
Expand Down
31 changes: 17 additions & 14 deletions ...rosoft.DotNet.Test.ProjectTemplates.1.x/content/MSTest-CSharp/Company.TestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions ...tNet.Test.ProjectTemplates.1.x/content/MSTest-FSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...oft.DotNet.Test.ProjectTemplates.1.x/content/MSTest-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
}
],
"defaultValue": "netcoreapp1.1"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.fsproj" } ]
Expand Down
43 changes: 23 additions & 20 deletions ...rosoft.DotNet.Test.ProjectTemplates.1.x/content/MSTest-FSharp/Company.TestProject1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions ...otNet.Test.ProjectTemplates.1.x/content/XUnit-CSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...soft.DotNet.Test.ProjectTemplates.1.x/content/XUnit-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
}
],
"defaultValue": "netcoreapp1.1"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.csproj" } ]
Expand Down
31 changes: 17 additions & 14 deletions ...crosoft.DotNet.Test.ProjectTemplates.1.x/content/XUnit-CSharp/Company.TestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions ...otNet.Test.ProjectTemplates.1.x/content/XUnit-FSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...soft.DotNet.Test.ProjectTemplates.1.x/content/XUnit-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
}
],
"defaultValue": "netcoreapp1.1"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.fsproj" } ]
Expand Down
43 changes: 23 additions & 20 deletions ...crosoft.DotNet.Test.ProjectTemplates.1.x/content/XUnit-FSharp/Company.TestProject1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

</Project>
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Framework)' != 'netcoreapp1.1'">netcoreapp1.0</TargetFramework>
<TargetFramework Condition="'$(Framework)' == 'netcoreapp1.1'">netcoreapp1.1</TargetFramework>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions ...tNet.Test.ProjectTemplates.2.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...oft.DotNet.Test.ProjectTemplates.2.0/content/MSTest-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
],
"replaces": "netcoreapp2.0",
"defaultValue": "netcoreapp2.0"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.csproj" } ]
Expand Down
31 changes: 17 additions & 14 deletions ...rosoft.DotNet.Test.ProjectTemplates.2.0/content/MSTest-CSharp/Company.TestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-beta-001507</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-beta-001507</RuntimeFrameworkVersion>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions ...tNet.Test.ProjectTemplates.2.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
},
"EnablePack": {
"shortName": "p",
"longName": "enable-pack"
}
}
}
6 changes: 6 additions & 0 deletions ...oft.DotNet.Test.ProjectTemplates.2.0/content/MSTest-FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
],
"replaces": "netcoreapp2.0",
"defaultValue": "netcoreapp2.0"
},
"EnablePack": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"description": "Whether or not to enable packaging (via (\"dotnet pack\") for the project."
}
},
"primaryOutputs": [ { "path": "Company.TestProject1.fsproj" } ]
Expand Down
43 changes: 23 additions & 20 deletions ...rosoft.DotNet.Test.ProjectTemplates.2.0/content/MSTest-FSharp/Company.TestProject1.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-beta-001507</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-beta-001507</RuntimeFrameworkVersion>

<IsPackable Condition="'$(EnablePack)' == 'true'">true</IsPackable>
<IsPackable Condition="'$(EnablePack)' != 'true'">false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/*.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.1.*" />
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
</ItemGroup>

</Project>
Loading