DO_TargetFrameworks env var to multitargeting build · DataObjects-NET/dataobjects-net@eb4bbf5 · GitHub

DataObjects-NET / dataobjects-net Public

• Notifications You must be signed in to change notification settings
• Fork 29
• Star 67

• Code
• Issues 35
• Pull requests 19
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit eb4bbf5

Browse filesBrowse the repository at this point in the historyBrowse files

SergeiPavlov

committed

DO_TargetFrameworks env var to multitargeting build

1 parent f9d4d0f commit eb4bbf5
Copy full SHA for eb4bbf5

3 files changed

+6-5Lines changed: 6 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Directory.Build.props
• MSBuild
  • DataObjects.Net.targets
• Weaver/Xtensive.Orm.Weaver
  • Xtensive.Orm.Weaver.csproj

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Directory.Build.props‎

Copy file name to clipboardExpand all lines: Directory.Build.props

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -40,23 +40,24 @@
40	40	<PropertyGroup>
41	41	<NoLogo>true</NoLogo>
42	42	<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
43		- <TargetFramework>net5.0</TargetFramework>
	43	+ <TargetFrameworks>net5.0</TargetFrameworks>
	44	+ <TargetFrameworks Condition="'$(DO_TargetFrameworks)' != ''">$(DO_TargetFrameworks)</TargetFrameworks>
44	45	<LangVersion>9.0</LangVersion>
45	46	<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
46	47	$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
47	48	<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
48	49	<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
49	50	<ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
50	51	<BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
51		- <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
	52	+ <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
52	53	<BaseOutputPath>$(ArtifactsDir)bin\$(Configuration)\</BaseOutputPath>
53	54	<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))
54	55	OR $(MSBuildProjectName) == 'TestCommon'
55	56	OR $(MSBuildProjectName) == 'Xtensive.Orm.Manual'">$(ArtifactsDir)tests\$(Configuration)\</BaseOutputPath>
56	57	<OutputPath>$(BaseOutputPath)lib\</OutputPath>
57	58	<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
58	59	<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
59		- <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
	60	+ <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(TargetFramework)\$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
60	61	<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
61	62	</PropertyGroup>
62	63

Collapse file

‎MSBuild/DataObjects.Net.targets‎

Copy file name to clipboardExpand all lines: MSBuild/DataObjects.Net.targets

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@
12	12	<CompileDependsOn>$(CompileDependsOn);XtensiveOrmBuild</CompileDependsOn>
13	13	<XtensiveOrmPath Condition="'$(XtensiveOrmPath)'==''">$(MSBuildThisFileDirectory)</XtensiveOrmPath>
14	14	<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)\</XtensiveOrmPath>
15		- <XtensiveOrmWeaver Condition="'$(XtensiveOrmWeaver)'==''">$(XtensiveOrmPath)tools\weaver\Xtensive.Orm.Weaver.dll</XtensiveOrmWeaver>
	15	+ <XtensiveOrmWeaver Condition="'$(XtensiveOrmWeaver)'==''">$(XtensiveOrmPath)tools\weaver\$(TargetFramework)\Xtensive.Orm.Weaver.dll</XtensiveOrmWeaver>
16	16	<XtensiveOrmBuildDependsOn>$(XtensiveOrmBuildDependsOn)</XtensiveOrmBuildDependsOn>
17	17	</PropertyGroup>
18	18

Collapse file

‎Weaver/Xtensive.Orm.Weaver/Xtensive.Orm.Weaver.csproj‎

Copy file name to clipboardExpand all lines: Weaver/Xtensive.Orm.Weaver/Xtensive.Orm.Weaver.csproj

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -5,7 +5,7 @@
5	5	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
6	6	<SignAssembly>true</SignAssembly>
7	7	<AssemblyOriginatorKeyFile>$(OrmKeyFile)</AssemblyOriginatorKeyFile>
8		- <OutputPath>$(BaseOutputPath)tools\weaver\</OutputPath>
	8	+ <OutputPath>$(BaseOutputPath)tools\weaver\$(TargetFramework)\</OutputPath>
9	9	<RollForward>Major</RollForward>
10	10	</PropertyGroup>
11	11	<ItemGroup>

0 commit comments

Comments

0 (0)