Skip to content

Nuget SemVer, dotnet build, dotnet pack and SourceLink Implemented #980

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
artifacts
649 changes: 649 additions & 0 deletions src/Directory.Build.props

Large diffs are not rendered by default.

42 changes: 25 additions & 17 deletions src/PartialTrustTestRunner/PartialTrustTestRunner.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project>

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<AssemblyName>PartialTrustTestRunner</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>PartialTrustTestRunner</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>
<AssemblyName>PartialTrustTestRunner</AssemblyName>
<PackageId>PartialTrustTestRunner</PackageId>
<Product>SimpleInjector.PartialTrustConsole</Product>

<ItemGroup>
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
</ItemGroup>
<Title>SimpleInjector Partial Trust Test Runner</Title>
<AssemblyTitle>SimpleInjector Partial Trust Test Runner</AssemblyTitle>
<Description>SimpleInjector Partial Trust Test Runner.</Description>
</PropertyGroup>

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

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

<ItemGroup>
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
</ItemGroup>

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

</Project>
14 changes: 2 additions & 12 deletions src/PartialTrustTestRunner/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleInjector.PartialTrustConsole")]
[assembly: AssemblyTrademark("")]
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e710bb05-06b6-40fc-9ba0-d02fff69a532")]
[assembly: Guid("e710bb05-06b6-40fc-9ba0-d02fff69a532")]
29 changes: 1 addition & 28 deletions src/SimpleInjector.CI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SimpleInjector.CI")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleInjector.CI")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -21,16 +7,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6c96df05-104b-4ad0-b686-0fb59aef1dc2")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
95 changes: 40 additions & 55 deletions src/SimpleInjector.CI/SimpleInjector.CI.csproj
Original file line number Diff line number Diff line change
@@ -1,56 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SimpleInjector.CI</RootNamespace>
<AssemblyName>SimpleInjector.CI</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Project>

<PropertyGroup>
<TargetFramework>net452</TargetFramework>
<IsPackable>false</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<AssemblyName>SimpleInjector.CI</AssemblyName>
<PackageId>SimpleInjector.CI</PackageId>
<Product>SimpleInjector.CI</Product>

<Title>SimpleInjector CI</Title>
<AssemblyTitle>SimpleInjector CI</AssemblyTitle>
<Description>SimpleInjector CI.</Description>
</PropertyGroup>

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

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

<ItemGroup>
<PackageReference Include="coveralls.net" version="0.6.0" />
<PackageReference Include="NUnit.ConsoleRunner" version="3.4.0" />
<PackageReference Include="NUnit.Extension.NUnitProjectLoader" version="3.4.0" />
<PackageReference Include="NUnit.Extension.NUnitV2Driver" version="3.4.0" />
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter" version="3.4.0" />
<PackageReference Include="NUnit.Extension.TeamCityEventListener" version="1.0.0" />
<PackageReference Include="NUnit.Extension.VSProjectLoader" version="3.4.0" />
<PackageReference Include="NUnit.Runners" version="3.4.0" />
<PackageReference Include="OpenCover" version="4.6.519" />
<PackageReference Include="ReportGenerator" version="2.5.3" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
13 changes: 0 additions & 13 deletions src/SimpleInjector.CI/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleInjector.CodeSamples.Tests.Unit2")]
[assembly: AssemblyTrademark("")]
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fce00ecf-2995-41c3-8555-660b6dfd282a")]
[assembly: Guid("fce00ecf-2995-41c3-8555-660b6dfd282a")]
Original file line number Diff line number Diff line change
@@ -1,33 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>SimpleInjector.CodeSamples.Tests.Unit</AssemblyName>
<PackageId>SimpleInjector.CodeSamples.Tests.Unit</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeIdentifiers>win10-x86</RuntimeIdentifiers>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SimpleInjector.DynamicAssemblyCompilation\SimpleInjector.DynamicAssemblyCompilation.csproj" />
<ProjectReference Include="..\SimpleInjector.Tests.Unit\SimpleInjector,Tests.Unit.csproj" />
<ProjectReference Include="..\SimpleInjector\SimpleInjector.csproj" />
<ProjectReference Include="..\SimpleInjector.CodeSamples\SimpleInjector.CodeSamples.csproj" />
</ItemGroup>

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

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

<!--
CA1707 // Identifiers should not contain underscores
Can be safely ignored in test projects
-->
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeIdentifiers>win10-x86</RuntimeIdentifiers>

<IsPackable>false</IsPackable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CA1707</NoWarn>

<AssemblyName>SimpleInjector.CodeSamples.Tests.Unit</AssemblyName>
<PackageId>SimpleInjector.CodeSamples.Tests.Unit</PackageId>
<Product>SimpleInjector.CodeSamples.Tests.Unit</Product>

<Title>SimpleInjector CodeSamples Tests Unit</Title>
<AssemblyTitle>SimpleInjector CodeSamples Tests Unit</AssemblyTitle>
<Description>SimpleInjector CodeSamples Tests Unit.</Description>
</PropertyGroup>

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

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

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

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

<ItemGroup>
<ProjectReference Include="$(SrcFolder)SimpleInjector.DynamicAssemblyCompilation\SimpleInjector.DynamicAssemblyCompilation.csproj" />
<ProjectReference Include="$(SrcFolder)SimpleInjector.Tests.Unit\SimpleInjector,Tests.Unit.csproj" />
<ProjectReference Include="$(SrcFolder)SimpleInjector\SimpleInjector.csproj" />
<ProjectReference Include="$(SrcFolder)SimpleInjector.CodeSamples\SimpleInjector.CodeSamples.csproj" />
</ItemGroup>

</Project>
14 changes: 2 additions & 12 deletions src/SimpleInjector.CodeSamples/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleInjector.CodeSamples")]
[assembly: AssemblyTrademark("")]
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a785be2f-e759-40a4-988c-c9ac052ad8cc")]
[assembly: Guid("a785be2f-e759-40a4-988c-c9ac052ad8cc")]
Loading