Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: dotnet: change assembly versioning scheme (fix to 1.0.0.0)

Browse Source
This commit is contained in:
Bill Zissimopoulos 2017-04-13 16:04:13 -07:00
parent 197ce7c30a
commit 9770efde14
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/VStudio/dotnet/winfsp.net.csproj
View File

@ -87,7 +87,9 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>set TargetName=$(TargetName) <PostBuildEvent>exit /b 0
set TargetName=$(TargetName)
set MyAssemblyPolicyVersion=$(MyAssemblyPolicyVersion) set MyAssemblyPolicyVersion=$(MyAssemblyPolicyVersion)
set MyAssemblyVersion=$(MyAssemblyVersion) set MyAssemblyVersion=$(MyAssemblyVersion)

9
build/VStudio/installer/Product.wxs
View File

@ -87,10 +87,11 @@
<Condition>NOT VersionNT64</Condition> <Condition>NOT VersionNT64</Condition>
</Component> </Component>
<!-- install assembly and also GAC it and its policy --> <!-- install assembly -->
<Component Id="C.winfsp_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179"> <Component Id="C.winfsp_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
<File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" /> <File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" />
</Component> </Component>
<!--
<Component Id="C.winfsp_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85"> <Component Id="C.winfsp_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
<File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" /> <File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
</Component> </Component>
@ -98,6 +99,7 @@
<File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" /> <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
<File Name="policy.1.0.winfsp-msil.config" KeyPath="no" /> <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
</Component> </Component>
-->
<!-- On Win64 ServiceInstall launcher-x64.exe --> <!-- On Win64 ServiceInstall launcher-x64.exe -->
<Component Id="C.launcher_x64.exe.svcinst"> <Component Id="C.launcher_x64.exe.svcinst">
@ -446,8 +448,10 @@
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="C.WinFsp.net"> <ComponentGroup Id="C.WinFsp.net">
<ComponentRef Id="C.winfsp_msil.dll" /> <ComponentRef Id="C.winfsp_msil.dll" />
<!--
<ComponentRef Id="C.winfsp_msil.dll.GAC" /> <ComponentRef Id="C.winfsp_msil.dll.GAC" />
<ComponentRef Id="C.policy.winfsp_msil.dll.GAC" /> <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
-->
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="C.WinFsp.smp.net"> <ComponentGroup Id="C.WinFsp.smp.net">
<ComponentRef Id="C.passthrough_dotnet.Program.cs" /> <ComponentRef Id="C.passthrough_dotnet.Program.cs" />
@ -476,7 +480,9 @@
InstallDefault="local" InstallDefault="local"
Absent="disallow"> Absent="disallow">
<ComponentGroupRef Id="C.WinFsp.bin" /> <ComponentGroupRef Id="C.WinFsp.bin" />
<ComponentGroupRef Id="C.WinFsp.net" />
</Feature> </Feature>
<!--
<Feature <Feature
Id="F.Net" Id="F.Net"
Level="10" Level="10"
@ -487,6 +493,7 @@
Absent="allow"> Absent="allow">
<ComponentGroupRef Id="C.WinFsp.net" /> <ComponentGroupRef Id="C.WinFsp.net" />
</Feature> </Feature>
-->
<Feature <Feature
Id="F.Developer" Id="F.Developer"
Level="1000" Level="1000"

4
build/VStudio/version.properties
View File

@ -24,8 +24,8 @@
<MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas> <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
<MyFullVersion>$(MyCanonicalVersion).$(MyBuildNumber).$(MyGitRevision)</MyFullVersion> <MyFullVersion>$(MyCanonicalVersion).$(MyBuildNumber).$(MyGitRevision)</MyFullVersion>
<MyAssemblyPolicyVersion>$(MyVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion> <MyAssemblyPolicyVersion>$(MyCanonicalVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
<MyAssemblyVersion>$(MyVersion).0</MyAssemblyVersion> <MyAssemblyVersion>$(MyAssemblyPolicyVersion).0.0</MyAssemblyVersion>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>

2
tst/passthrough-dotnet/passthrough-dotnet.csproj
View File

@ -53,7 +53,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="winfsp-msil, Version=1.1.17101.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL"> <Reference Include="winfsp-msil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>$(MSBuildProgramFiles32)\WinFsp\bin\winfsp-msil.dll</HintPath> <HintPath>$(MSBuildProgramFiles32)\WinFsp\bin\winfsp-msil.dll</HintPath>
</Reference> </Reference>