diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-11 16:53:56 +0300 |
| commit | 111684728db118e40f05efc01287ea91ea295502 (patch) | |
| tree | 10f619288f346b713a31e3231253cd5b68bae481 /Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj | |
| parent | d045a47ad7363e62b763013fa6afcdb1762a7ce3 (diff) | |
| parent | 7a914abc9e34c12acec0234ab748e17a21833af7 (diff) | |
| download | Tango-111684728db118e40f05efc01287ea91ea295502.tar.gz Tango-111684728db118e40f05efc01287ea91ea295502.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj')
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 52ecba507..f6040c5b1 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -313,6 +313,8 @@ <Content Include="Scripts\Account\Login.js" /> <Content Include="Scripts\bootstrap.js" /> <Content Include="Scripts\bootstrap.min.js" /> + <None Include="Properties\PublishProfiles\Beta.pubxml" /> + <None Include="Properties\PublishProfiles\Alpha.pubxml" /> <None Include="Scripts\jquery-3.3.1.intellisense.js" /> <Content Include="Scripts\jquery-3.3.1.js" /> <Content Include="Scripts\jquery-3.3.1.min.js" /> @@ -381,7 +383,6 @@ <None Include="Properties\PublishProfiles\Process.pubxml" /> <None Include="Properties\PublishProfiles\Testing.pubxml" /> <None Include="Properties\PublishProfiles\Production.pubxml" /> - <None Include="Properties\PublishProfiles\Publish Machine Service via FTP.pubxml" /> <Content Include="Views\Downloads\Index.cshtml" /> <Content Include="Views\Shared\Error.cshtml" /> <Content Include="Views\Shared\_Layout.cshtml" /> @@ -417,7 +418,7 @@ <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> </WebProjectProperties> </FlavorProperties> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |