Skip to content

Commit

Permalink
Test against ATEM library 7.3
Browse files Browse the repository at this point in the history
Update versioning and about info.
  • Loading branch information
mintopia committed Feb 1, 2018
1 parent fe3a56b commit 239cbe0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 15 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/Release
/SwitcherLib/bin
/MediaPool/bin
/MediaUpload/bin
/SwitcherLib/obj
/MediaPool/obj
/MediaUpload/obj
/packages
8 changes: 4 additions & 4 deletions MediaPool/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("ATEM Media Pool List")]
[assembly: AssemblyDescription("Retrieves a list of media in the media pool of an ATEM Switcher")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Michael Smith")]
[assembly: AssemblyCompany("Jessica Smith")]
[assembly: AssemblyProduct("ATEM Switcher Library")]
[assembly: AssemblyCopyright("© Copyright Michael Smith, 2014")]
[assembly: AssemblyCopyright("© Copyright Jessica Smith, 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
8 changes: 4 additions & 4 deletions MediaUpload/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("ATEM Media Upload")]
[assembly: AssemblyDescription("Uploads still images to the media library of ATEM switchers")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Michael Smith")]
[assembly: AssemblyCompany("Jessica Smith")]
[assembly: AssemblyProduct("ATEM Switcher Library")]
[assembly: AssemblyCopyright("© Copyright Michael Smith, 2014")]
[assembly: AssemblyCopyright("© Copyright Jessica Smith, 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
3 changes: 2 additions & 1 deletion Prep Release.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ xcopy MediaPool\bin\release\MediaPool.exe Release /C /H /Y
xcopy MediaPool\bin\release\*.dll Release /C /H /Y
xcopy MediaUpload\bin\release\MediaUpload.exe Release /C /H /Y
xcopy MediaUpload\bin\release\*.dll Release /C /H /Y
cp readme.txt Release/readme.txt
xcopy readme.md Release\readme.md /C /H /Y
pause
10 changes: 5 additions & 5 deletions SwitcherLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// 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("SwitcherLib")]
[assembly: AssemblyTitle("ATEM Switcher Library")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SwitcherLib")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyProduct("ATEM Switcher Library")]
[assembly: AssemblyCopyright("© Copyright Jessica Smith, 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
4 changes: 3 additions & 1 deletion SwitcherLib/SwitcherLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SwitcherLibException.cs" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="BMDSwitcherAPI">
<Guid>{8A92B919-156C-4D61-94EF-03F9BE4004B0}</Guid>
Expand All @@ -61,7 +64,6 @@
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down

0 comments on commit 239cbe0

Please sign in to comment.