Skip to content

Simplify msbuild-example #207

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 5 commits into from
Jul 9, 2020
Merged

Simplify msbuild-example #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55371ec
Simplify msbuild-example
eyalb4doc Jul 8, 2020
7eec4f5
Simplify msbuild-example
eyalb4doc Jul 8, 2020
20690db
Update msbuild-example README
eyalb4doc Jul 9, 2020
c9fc48c
Update msbuild-example nuspec
eyalb4doc Jul 9, 2020
2a67d67
CR fixes
eyalb4doc Jul 9, 2020
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
6 changes: 0 additions & 6 deletions msbuild-example/MsbuildExample/App.config
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions msbuild-example/MsbuildExample/App.xaml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions msbuild-example/MsbuildExample/App.xaml.cs
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions msbuild-example/MsbuildExample/MainWindow.xaml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions msbuild-example/MsbuildExample/MainWindow.xaml.cs
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions msbuild-example/MsbuildExample/MsbuildExample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MsbuildExample
{
public class MsbuildExample
{
public static string HelloWorld()
{
return "Hello world";
}
}
}
81 changes: 12 additions & 69 deletions msbuild-example/MsbuildExample/MsbuildExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

<Target Name="SetJFrogProperties" BeforeTargets="DownloadDependencies;PrepareForBuild" Condition=" '$(ArtifactoryPublish)' == 'true' ">
<Message Text="Setting JFrog properties"/>
<!--Build name property-->
Expand Down Expand Up @@ -32,11 +32,11 @@
<Exec Command="jfrog rt download msbuild-local/MsbuildLibrary/bin/Debug/MsbuildLibrary.dll dependencies\ --flat=true $(BuildFlags)"/>
</Target>

<ItemGroup>
<!-- <ItemGroup>
<Reference Include="'MsbuildLibrary">
<HintPath>dependencies\MsbuildLibrary.dll</HintPath>
</Reference>
</ItemGroup>
</ItemGroup> -->

<Target Name="UploadArtifacts" AfterTargets="AfterBuild" Condition=" '$(ArtifactoryPublish)' == 'true' ">
<Message Text="Upload artifacts"/>
Expand Down Expand Up @@ -72,28 +72,24 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{CF2799F3-E037-4C77-A8CA-E66F323EA1D3}</ProjectGuid>
<OutputType>WinExe</OutputType>
<ProjectGuid>{C7BE00B6-A619-4FB9-8F19-A11793CF0F14}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MsbuildExample</RootNamespace>
<AssemblyName>MsbuildExample</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>obj\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -103,70 +99,17 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<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.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<Compile Include="MsbuildExample.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<!-- <ItemGroup>
<ProjectReference Include="..\MsbuildLibrary\MsbuildLibrary.csproj">
<Project>{C7BE00B6-A619-4FB9-8F19-A11793CF0F14}</Project>
<Name>MsbuildLibrary</Name>
</ProjectReference>
</ItemGroup>
-->
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
17 changes: 17 additions & 0 deletions msbuild-example/MsbuildExample/MsbuildExample.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>MsbuildExample</id>
<version>1.0.0</version>
<title>MsbuildExample</title>
<authors>Alex K</authors>
<owners>Alex K</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>http://github.com/jfrog/project-examples/msbuild-example/</projectUrl>
<description>MsbuildExample</description>
<releaseNotes>This is a test package.</releaseNotes>
<copyright>Copyright 2020</copyright>
<tags>Msbuild Example</tags>
</metadata>
</package>
27 changes: 4 additions & 23 deletions msbuild-example/MsbuildExample/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;

// 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("MsbuildExample")]
[assembly: AssemblyTitle("MsbuildLibrary")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("MsbuildExample")]
[assembly: AssemblyProduct("MsbuildLibrary")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand All @@ -21,25 +19,8 @@
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.

//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]


[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c7be00b6-a619-4fb9-8f19-a11793cf0f14")]

// Version information for an assembly consists of the following four values:
//
Expand Down
71 changes: 0 additions & 71 deletions msbuild-example/MsbuildExample/Properties/Resources.Designer.cs
View file
Open in desktop

This file was deleted.

Loading