Skip to content

Commit

Permalink
Merge pull request #5 from dlepow/master
Browse files Browse the repository at this point in the history
Update to target .NET core 2.1
  • Loading branch information
dlepow authored Sep 10, 2018
2 parents e78b685 + 5e1dfe1 commit 798a761
Show file tree
Hide file tree
Showing 6 changed files with 156 additions and 157 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ dlldata.c
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

*_i.c
*_p.c
Expand Down
6 changes: 3 additions & 3 deletions BatchDotnetTutorialFfmpeg/BatchDotnetTutorialFfmpeg.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Microsoft.Azure.Batch.Samples.BatchDotNetTutorialFfmpeg</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Batch" Version="8.1.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.2.0" />
<PackageReference Include="Microsoft.Azure.Batch" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />
</ItemGroup>

</Project>
5 changes: 4 additions & 1 deletion BatchDotnetTutorialFfmpeg/BatchDotnetTutorialFfmpeg.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BatchDotnetTutorialFfmpeg", "BatchDotnetTutorialFfmpeg.csproj", "{C8DFEFA7-5BC3-4217-88DC-791020D6A909}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BatchDotnetTutorialFfmpeg", "BatchDotnetTutorialFfmpeg.csproj", "{C8DFEFA7-5BC3-4217-88DC-791020D6A909}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CAC1578-E7D4-416E-BB9D-1A9800B0F1A6}"
EndProject
Expand All @@ -23,4 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40550F11-FA23-4798-B91D-D045F41F982C}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 798a761

Please sign in to comment.